Skip to content

Commit 4d3f732

Browse files
committed
Merge branch 'master' into let-at
2 parents fe91467 + 63e20a1 commit 4d3f732

File tree

164 files changed

+2916
-1201
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+2916
-1201
lines changed

.github/workflows/coverage.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
os:
19-
- ubuntu-22.04 # https://github.com/ocaml/setup-ocaml/issues/872
19+
- ubuntu-latest
2020
ocaml-compiler:
2121
- ocaml-variants.4.14.2+options,ocaml-option-flambda # matches opam lock file
2222
# don't add any other because they won't be used
@@ -28,7 +28,7 @@ jobs:
2828

2929
steps:
3030
- name: Checkout code
31-
uses: actions/checkout@v5
31+
uses: actions/checkout@v6
3232

3333
- name: Set up OCaml ${{ matrix.ocaml-compiler }}
3434
env:
@@ -40,7 +40,7 @@ jobs:
4040
ocaml-compiler: ${{ matrix.ocaml-compiler }}
4141

4242
- name: Install graph-easy # TODO: remove if depext --with-test works (https://github.com/ocaml/opam/issues/5836)
43-
if: ${{ matrix.os == 'ubuntu-22.04' }}
43+
if: ${{ startsWith(matrix.os, 'ubuntu') }}
4444
run: sudo apt install -y libgraph-easy-perl
4545

4646
- name: Install dependencies
@@ -59,14 +59,18 @@ jobs:
5959
run: ./make.sh headers
6060

6161
- name: Test
62-
run: opam exec -- dune runtest --instrument-with bisect_ppx
62+
env:
63+
BISECT_FILE: ${{ github.workspace }}/_build/coverage/bisect
64+
run: |
65+
mkdir -p _build/coverage
66+
opam exec -- dune runtest --force --instrument-with bisect_ppx
6367
6468
- run: opam exec -- bisect-ppx-report send-to Coveralls
6569
env:
6670
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
6771
PULL_REQUEST_NUMBER: ${{ github.event.number }}
6872

69-
- uses: actions/upload-artifact@v5
73+
- uses: actions/upload-artifact@v6
7074
if: always()
7175
with:
7276
name: suite_result

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
steps:
3737
- name: Checkout code
38-
uses: actions/checkout@v5
38+
uses: actions/checkout@v6
3939

4040
- name: Set up Docker Buildx
4141
uses: docker/setup-buildx-action@v3 # needed for GitHub Actions Cache in build-push-action

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
matrix:
1818
os:
19-
- ubuntu-22.04 # https://github.com/ocaml/setup-ocaml/issues/872
19+
- ubuntu-latest
2020
ocaml-compiler:
2121
- ocaml-variants.4.14.2+options,ocaml-option-flambda # matches opam lock file
2222
# don't add any other because they won't be used
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: Checkout code
28-
uses: actions/checkout@v5
28+
uses: actions/checkout@v6
2929

3030
- name: Check for undocumented modules
3131
run: python scripts/goblint-lib-modules.py

.github/workflows/indentation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
os:
13-
- ubuntu-22.04 # https://github.com/ocaml/setup-ocaml/issues/872
13+
- ubuntu-latest
1414
ocaml-compiler:
1515
- 4.14.x
1616

@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: Checkout code
23-
uses: actions/checkout@v5
23+
uses: actions/checkout@v6
2424
with:
2525
fetch-depth: 0
2626

.github/workflows/locked.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
os:
20-
- ubuntu-22.04 # https://github.com/ocaml/setup-ocaml/issues/872
21-
- macos-13
20+
- ubuntu-latest
21+
- macos-latest
2222
ocaml-compiler:
2323
- ocaml-variants.4.14.2+options,ocaml-option-flambda # matches opam lock file
2424
# don't add any other because they won't be used
@@ -30,7 +30,7 @@ jobs:
3030

3131
steps:
3232
- name: Checkout code
33-
uses: actions/checkout@v5
33+
uses: actions/checkout@v6
3434

3535
- name: Set up OCaml ${{ matrix.ocaml-compiler }}
3636
env:
@@ -42,7 +42,7 @@ jobs:
4242
ocaml-compiler: ${{ matrix.ocaml-compiler }}
4343

4444
- name: Install graph-easy # TODO: remove if depext --with-test works (https://github.com/ocaml/opam/issues/5836)
45-
if: ${{ matrix.os == 'ubuntu-22.04' }}
45+
if: ${{ startsWith(matrix.os, 'ubuntu') }}
4646
run: sudo apt install -y libgraph-easy-perl
4747

4848
- name: Install dependencies
@@ -60,7 +60,7 @@ jobs:
6060
- name: Test
6161
run: opam exec -- dune runtest
6262

63-
- uses: actions/upload-artifact@v5
63+
- uses: actions/upload-artifact@v6
6464
if: always()
6565
with:
6666
name: suite_result-${{ matrix.os }}
@@ -73,7 +73,7 @@ jobs:
7373
fail-fast: false
7474
matrix:
7575
os:
76-
- ubuntu-22.04 # https://github.com/ocaml/setup-ocaml/issues/872
76+
- ubuntu-latest
7777
ocaml-compiler:
7878
- ocaml-variants.4.14.2+options,ocaml-option-flambda # matches opam lock file
7979
# don't add any other because they won't be used
@@ -82,7 +82,7 @@ jobs:
8282

8383
steps:
8484
- name: Checkout code
85-
uses: actions/checkout@v5
85+
uses: actions/checkout@v6
8686

8787
- name: Set up OCaml ${{ matrix.ocaml-compiler }}
8888
env:
@@ -94,7 +94,7 @@ jobs:
9494
ocaml-compiler: ${{ matrix.ocaml-compiler }}
9595

9696
- name: Install graph-easy # TODO: remove if depext --with-test works (https://github.com/ocaml/opam/issues/5836)
97-
if: ${{ matrix.os == 'ubuntu-22.04' }}
97+
if: ${{ startsWith(matrix.os, 'ubuntu') }}
9898
run: sudo apt install -y libgraph-easy-perl
9999

100100
- name: Install spin

.github/workflows/metadata.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Checkout code
22-
uses: actions/checkout@v5
22+
uses: actions/checkout@v6
2323

2424
- name: Validate CITATION.cff
2525
uses: docker://citationcff/cffconvert:latest
@@ -39,7 +39,7 @@ jobs:
3939

4040
steps:
4141
- name: Checkout code
42-
uses: actions/checkout@v5
42+
uses: actions/checkout@v6
4343

4444
- name: Set up Node.js ${{ matrix.node-version }}
4545
uses: actions/setup-node@v6

.github/workflows/options.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
steps:
1717
- name: Checkout code
18-
uses: actions/checkout@v5
18+
uses: actions/checkout@v6
1919

2020
- name: Set up Node.js ${{ matrix.node-version }}
2121
uses: actions/setup-node@v6

.github/workflows/semgrep.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: Checkout code
19-
uses: actions/checkout@v5
19+
uses: actions/checkout@v6
2020

2121
- name: Run semgrep
2222
run: semgrep scan --config .semgrep/ --sarif > semgrep.sarif

0 commit comments

Comments
 (0)