Skip to content

Commit

Permalink
Merge pull request #9 from coq-community/meta-8.18
Browse files Browse the repository at this point in the history
update CI and other boilerplate for 8.18
  • Loading branch information
palmskog authored Aug 19, 2023
2 parents 0320247 + b3fcfc7 commit cc5f9c6
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 10 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/docker-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ jobs:
matrix:
image:
- 'coqorg/coq:dev'
- 'coqorg/coq:8.18'
- 'coqorg/coq:8.17'
- 'coqorg/coq:8.16'
- 'coqorg/coq:8.15'
- 'coqorg/coq:8.14'
Expand All @@ -26,12 +28,13 @@ jobs:
- 'coqorg/coq:8.11'
fail-fast: false
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: coq-community/docker-coq-action@v1
with:
opam_file: 'coq-almost-full.opam'
custom_image: ${{ matrix.image }}


# See also:
# https://github.com/coq-community/docker-coq-action#readme
# https://github.com/erikmd/docker-coq-github-action-demo
6 changes: 3 additions & 3 deletions .github/workflows/nix-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ jobs:
else
echo "tested_commit=${{ github.sha }}" >> $GITHUB_ENV
fi
- uses: cachix/install-nix-action@v16
- uses: cachix/install-nix-action@v20
with:
nix_path: nixpkgs=channel:nixpkgs-unstable
- uses: cachix/cachix-action@v10
- uses: cachix/cachix-action@v12
with:
name: coq-community
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
extraPullNames: coq, math-comp
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: ${{ env.tested_commit }}
- run: >
Expand Down
4 changes: 2 additions & 2 deletions coq-almost-full.opam
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ Theorem, useful for proving termination."""

build: ["dune" "build" "-p" name "-j" jobs]
depends: [
"dune" {>= "2.5"}
"coq" {(>= "8.11" & < "8.17~") | (= "dev")}
"dune" {>= "3.5"}
"coq" {>= "8.11"}
]

tags: [
Expand Down
4 changes: 2 additions & 2 deletions dune-project
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
(lang dune 2.5)
(using coq 0.2)
(lang dune 3.5)
(using coq 0.6)
(name almost-full)
6 changes: 4 additions & 2 deletions meta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ community: true
action: true
nix: true
coqdoc: false
dune: false
dune: true
doi: 10.1007/978-3-642-32347-8_17

synopsis: >-
Expand Down Expand Up @@ -43,13 +43,15 @@ license:

supported_coq_versions:
text: 8.11 or later
opam: '{(>= "8.11" & < "8.17~") | (= "dev")}'
opam: '{>= "8.11"}'

tested_coq_nix_versions:
- coq_version: 'master'

tested_coq_opam_versions:
- version: dev
- version: '8.18'
- version: '8.17'
- version: '8.16'
- version: '8.15'
- version: '8.14'
Expand Down

0 comments on commit cc5f9c6

Please sign in to comment.