Skip to content

Commit 9c974f2

Browse files
committed
More coq versions to test.
1 parent dba4c42 commit 9c974f2

File tree

3 files changed

+13
-29
lines changed

3 files changed

+13
-29
lines changed

.github/workflows/ci-libhyps.yml

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,37 +15,21 @@ on:
1515

1616
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1717
jobs:
18-
# This workflow contains a single job called "build"
19-
build:
20-
# The type of runner that the job will run on
21-
runs-on: ubuntu-latest
22-
strategy:
23-
matrix:
24-
image:
25-
- 'rocq/rocq-prover:dev'
26-
- 'rocq/rocq-prover:9.0.0'
27-
# Steps represent a sequence of tasks that will be executed as part of the job
28-
steps:
29-
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
30-
- uses: actions/checkout@v3
31-
- uses: coq-community/docker-coq-action@v1
32-
with:
33-
opam_file: 'rocq-libhyps.opam'
34-
custom_image: ${{ matrix.image }}
35-
# env:
36-
# OPAMWITHTEST: 'true'
37-
38-
# This workflow contains a single job called "build"
18+
# this builds libhyps and also runs the tests
3919
build-and-test:
4020
# The type of runner that the job will run on
4121
runs-on: ubuntu-latest
22+
# this shell variable is detected by "opam install" and triggers
23+
# the "run-test" part of the opam project file
4224
env:
4325
OPAMWITHTEST: 'true'
4426
strategy:
4527
matrix:
4628
image:
29+
- 'rocq/rocq-prover:latest'
4730
- 'rocq/rocq-prover:dev'
48-
- 'rocq/rocq-prover:9.0.0'
31+
- 'rocq/rocq-prover:9.1'
32+
- 'rocq/rocq-prover:9.0'
4933
# Steps represent a sequence of tasks that will be executed as part of the job
5034
steps:
5135
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11

2-
3-
all: lib tests
4-
52
lib:
63
make -C LibHyps
74

8-
tests-lib:
5+
tests: lib
96
make -C tests
107

11-
tests: lib
8+
all: lib tests
9+
10+
tests-nolib:
1211
make -C tests
1312

1413
clean:
1514
make -C LibHyps clean
1615
make -C tests clean
1716

18-
install:
17+
# Don't install test files
18+
install: lib
1919
make -C LibHyps install
2020

rocq-libhyps.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ install: [make "install"]
2828

2929
depends: [
3030
"ocaml"
31-
"rocq-core" { (>= "9.0" ) | ("dev") }
31+
"rocq-core" { (>= "9.0" ) | ( " = dev") }
3232
"rocq-stdlib"
3333
]
3434

0 commit comments

Comments
 (0)