Skip to content

Commit

Permalink
adjust boilerplate for Coq 8.20
Browse files Browse the repository at this point in the history
  • Loading branch information
palmskog committed Jun 29, 2024
1 parent d32acd3 commit 3fb2355
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 41 deletions.
32 changes: 6 additions & 26 deletions .github/workflows/docker-action.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# This file was generated from `meta.yml`, please do not edit manually.
# Follow the instructions on https://github.com/coq-community/templates to regenerate.
name: Docker CI

on:
push:
branches:
- master
- v8.20
pull_request:
branches:
- '**'
Expand All @@ -15,37 +17,15 @@ jobs:
strategy:
matrix:
image:
- 'coqorg/coq:dev'
- 'coqorg/coq:8.20'
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: coq-community/docker-coq-action@v1
with:
opam_file: 'coq-stalmarck.opam'
custom_image: ${{ matrix.image }}
custom_script: |
{{before_install}}
startGroup "Build stalmarck dependencies"
opam pin add -n -y -k path coq-stalmarck .
opam update -y
opam install -y -j 2 coq-stalmarck --deps-only
endGroup
startGroup "Build stalmarck"
opam install -y -v -j 2 coq-stalmarck
opam list
endGroup
startGroup "Build stalmarck-tactic dependencies"
opam pin add -n -y -k path coq-stalmarck-tactic .
opam update -y
opam install -y -j 2 coq-stalmarck-tactic --deps-only
endGroup
startGroup "Build stalmarck-tactic"
opam install -y -v -j 2 coq-stalmarck-tactic
opam list
endGroup
startGroup "Uninstallation test"
opam remove -y coq-stalmarck-tactic
opam remove -y coq-stalmarck
endGroup


# See also:
# https://github.com/coq-community/docker-coq-action#readme
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nix-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Nix CI
on:
push:
branches:
- master
- v8.20
pull_request:
paths:
- .github/workflows/**
Expand All @@ -17,7 +17,7 @@ jobs:
strategy:
matrix:
overrides:
- 'coq = "master"'
- 'coq = "8.20"'
fail-fast: false
steps:
- name: Determine which commit to test
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ Follow the instructions on https://github.com/coq-community/templates to regener
[![Zulip][zulip-shield]][zulip-link]
[![DOI][doi-shield]][doi-link]

[docker-action-shield]: https://github.com/coq-community/stalmarck/actions/workflows/docker-action.yml/badge.svg?branch=master
[docker-action-shield]: https://github.com/coq-community/stalmarck/actions/workflows/docker-action.yml/badge.svg?branch=v8.20
[docker-action-link]: https://github.com/coq-community/stalmarck/actions/workflows/docker-action.yml

[nix-action-shield]: https://github.com/coq-community/stalmarck/actions/workflows/nix-action.yml/badge.svg?branch=master
[nix-action-shield]: https://github.com/coq-community/stalmarck/actions/workflows/nix-action.yml/badge.svg?branch=v8.20
[nix-action-link]: https://github.com/coq-community/stalmarck/actions/workflows/nix-action.yml

[contributing-shield]: https://img.shields.io/badge/contributions-welcome-%23f7931e.svg
Expand All @@ -41,7 +41,7 @@ algorithm in Coq.
- Coq-community maintainer(s):
- Karl Palmskog ([**@palmskog**](https://github.com/palmskog))
- License: [GNU Lesser General Public License v2.1 or later](LICENSE)
- Compatible Coq versions: Coq master (use the corresponding branch or release for other Coq versions)
- Compatible Coq versions: 8.20 (use the corresponding branch or release for other Coq versions)
- Additional dependencies: none
- Coq namespace: `Stalmarck.Algorithm`
- Related publication(s):
Expand Down
4 changes: 2 additions & 2 deletions coq-stalmarck-tactic.opam
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
maintainer: "[email protected]"
version: "dev"
version: "8.20.dev"

homepage: "https://github.com/coq-community/stalmarck"
dev-repo: "git+https://github.com/coq-community/stalmarck.git"
Expand All @@ -13,7 +13,7 @@ build: ["dune" "build" "-p" name "-j" jobs]
depends: [
"ocaml" {>= "4.09.0"}
"dune" {>= "2.8"}
"coq" {= "dev"}
"coq" {>= "8.20" & < "8.21"}
"coq-stalmarck" {= version}
]

Expand Down
4 changes: 2 additions & 2 deletions coq-stalmarck.opam
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

opam-version: "2.0"
maintainer: "[email protected]"
version: "dev"
version: "8.20.dev"

homepage: "https://github.com/coq-community/stalmarck"
dev-repo: "git+https://github.com/coq-community/stalmarck.git"
Expand All @@ -18,7 +18,7 @@ algorithm in Coq."""
build: [make "-j%{jobs}%"]
install: [make "install"]
depends: [
"coq" {= "dev"}
"coq" {>= "8.20" & < "8.21"}
]

tags: [
Expand Down
12 changes: 6 additions & 6 deletions meta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ action: true
nix: true
doi: 10.1007/3-540-44659-1_24
plugin: true
branch: master
branch: v8.20
dune: false

synopsis: Verified implementation of Stålmarck's algorithm for proving tautologies in Coq
Expand All @@ -33,21 +33,21 @@ maintainers:

opam-file-maintainer: [email protected]

opam-file-version: dev
opam-file-version: 8.20.dev

license:
fullname: GNU Lesser General Public License v2.1 or later
identifier: LGPL-2.1-or-later

supported_coq_versions:
text: Coq master (use the corresponding branch or release for other Coq versions)
opam: '{= "dev"}'
text: 8.20 (use the corresponding branch or release for other Coq versions)
opam: '{>= "8.20" & < "8.21"}'

tested_coq_nix_versions:
- coq_version: 'master'
- coq_version: '8.20'

tested_coq_opam_versions:
- version: 'dev'
- version: '8.20'

namespace: Stalmarck.Algorithm

Expand Down

0 comments on commit 3fb2355

Please sign in to comment.