Skip to content

Commit 5b9b58c

Browse files
Merge pull request herd#1652 from HadrienRenaud/add-logs-to-low-ci
[ci][gen] Add logs to dependencies in workflows This is a follow-up on herd#1574 that introduced a new dependency to herdtools7. We update all the workflows to use the correct dependencies. Note: Most of those are optimisations, I don't think any workflow was failing.
2 parents b0d1ffd + c899609 commit 5b9b58c

6 files changed

Lines changed: 15 additions & 9 deletions

File tree

.github/workflows/build-asl-reference.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Set-up OCaml
3737
uses: ocaml/setup-ocaml@v3
3838
with:
39-
ocaml-compiler: dune,zarith,menhir,conf-which
39+
ocaml-compiler: dune,zarith,menhir,logs,conf-which
4040
opam-disable-sandboxing: true
4141
dune-cache: true
4242

.github/workflows/build-www.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
with:
1616
ocaml-compiler: 5.1.0
1717
- run: |
18-
opam install dune menhir zarith js_of_ocaml.5.4.0 js_of_ocaml-ppx zarith_stubs_js
18+
opam install dune menhir zarith js_of_ocaml.5.4.0 js_of_ocaml-ppx zarith_stubs_js logs
1919
opam exec -- make Version.ml
2020
opam exec -- dune build tools/cat2html.exe
2121
opam exec -- make -C herd-www

.github/workflows/check-build-www.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
with:
3131
ocaml-compiler: 5.1.0
3232
- run: |
33-
opam install dune menhir zarith js_of_ocaml.5.4.0 js_of_ocaml-ppx zarith_stubs_js
33+
opam install dune menhir zarith js_of_ocaml.5.4.0 js_of_ocaml-ppx zarith_stubs_js logs
3434
opam exec -- make Version.ml
3535
opam exec -- dune build tools/cat2html.exe
3636
opam exec -- make -C herd-www

.github/workflows/make-test-diy.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,13 @@ jobs:
2323
os:
2424
- ubuntu-latest
2525
cfg:
26-
- ocaml-version: "ocaml-base-compiler.4.08.1,dune.3.10.0,zarith.1.13,menhir.20220210"
26+
# Minimal versions: we want to test both ends of the supported space
27+
- ocaml-version: "ocaml-base-compiler.4.08.1,dune.3.10.0,zarith.1.13,menhir.20220210,logs.0.7.0"
2728
job-name: "OCaml v4.08"
2829
dune-cache: "enabled"
29-
- ocaml-version: "dune,zarith,menhir"
30+
31+
# Maximal version: this will automatically select the most recent version compatible.
32+
- ocaml-version: "dune,zarith,menhir,logs"
3033
dune-cache: "enabled-except-user-rules"
3134
job-name: "OCaml latest lts"
3235

.github/workflows/make-test.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,14 @@ jobs:
2323
os:
2424
- ubuntu-latest
2525
cfg:
26-
- ocaml-version: "ocaml-base-compiler.4.08.1,dune.3.10.0,zarith.1.13,menhir.20220210"
26+
# Minimal versions: we want to test both ends of the supported space
27+
- ocaml-compiler: "ocaml-base-compiler.4.08.1,dune.3.10.0,zarith.1.13,menhir.20220210,logs.0.7.0"
2728
with-type-check-asl: false
2829
job-name: "OCaml v4.08"
2930
dune-cache: "enabled"
30-
- ocaml-version: "dune,zarith,menhir"
31+
32+
# Maximal version: this will automatically select the most recent version compatible.
33+
- ocaml-compiler: "dune,zarith,menhir,logs"
3134
with-type-check-asl: true
3235
dune-cache: "enabled-except-user-rules"
3336
job-name: "OCaml latest lts"
@@ -46,7 +49,7 @@ jobs:
4649
- name: Set-up OCaml
4750
uses: ocaml/setup-ocaml@v3
4851
with:
49-
ocaml-compiler: ${{ matrix.cfg.ocaml-version }}
52+
ocaml-compiler: ${{ matrix.cfg.ocaml-compiler }}
5053
dune-cache: true
5154

5255
- run: opam install . --deps-only --with-test

.github/workflows/run-litmus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: sudo apt update && sudo apt install qemu-system -qq
3838

3939
- name: Install opam dependencies
40-
run: opam install dune menhir zarith
40+
run: opam install . --deps-only
4141

4242
- name: Build local dependencies
4343
run: |

0 commit comments

Comments
 (0)