Skip to content

Commit a8d21d0

Browse files
sim642sim642
committed
Merge branch 'master' into invariant-mli
2 parents 85b4249 + 0109577 commit a8d21d0

File tree

667 files changed

+28131
-12402
lines changed

Some content is hidden

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

667 files changed

+28131
-12402
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,9 @@ c3e2cc848479ae86de5542b6ab0e75a74e9cf8c9
4040

4141
# Rename ctx -> man
4242
0c155e68607fede6fab17704a9a7aee38df5408e
43+
44+
# Trim trailing whitespace in BitfieldDomain
45+
d4e2a5f84ed3b7fbff89e34b2f7833de975e0671
46+
47+
# Fix BaseInvariant indentation
48+
15e7a7ebd34e9fabdd4129e97eb86830fea8395f

‎.gitattributes‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# GitHub repository language overrides
2+
# https://github.com/github-linguist/linguist/blob/main/docs/overrides.md
3+
4+
# currently only dune-project is classified: https://github.com/github-linguist/linguist/pull/7126
5+
dune linguist-language=dune
6+
dune.inc linguist-language=dune
7+
8+
# avoid misclassification as Standard ML
9+
*.ml linguist-language=ocaml
10+
*.mli linguist-language=ocaml
11+
12+
# cram tests are classified as Raku/Terra/Turing, cram isn't separate language so consider them also dune
13+
*.t linguist-language=dune

‎.github/workflows/coverage.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

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

3333
- name: Set up OCaml ${{ matrix.ocaml-compiler }}
3434
env:
@@ -39,13 +39,16 @@ jobs:
3939
with:
4040
ocaml-compiler: ${{ matrix.ocaml-compiler }}
4141

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

4646
- name: Install dependencies
4747
run: opam install . --deps-only --locked --with-test
4848

49+
- name: Install os gem for operating system detection
50+
run: sudo gem install os
51+
4952
- name: Install coverage dependencies
5053
run: opam install bisect_ppx
5154

@@ -63,7 +66,7 @@ jobs:
6366
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
6467
PULL_REQUEST_NUMBER: ${{ github.event.number }}
6568

66-
- uses: actions/upload-artifact@v4
69+
- uses: actions/upload-artifact@v5
6770
if: always()
6871
with:
6972
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@v4
38+
uses: actions/checkout@v5
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
@@ -25,7 +25,7 @@ jobs:
2525

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

3030
- name: Check for undocumented modules
3131
run: python scripts/goblint-lib-modules.py
@@ -50,7 +50,7 @@ jobs:
5050
run: opam exec -- dune build @doc
5151

5252
- name: Upload artifact
53-
uses: actions/upload-pages-artifact@v3
53+
uses: actions/upload-pages-artifact@v4
5454
with:
5555
path: _build/default/_doc/_html/
5656

‎.github/workflows/indentation.yml‎

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

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

‎.github/workflows/locked.yml‎

Lines changed: 11 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

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

3535
- name: Set up OCaml ${{ matrix.ocaml-compiler }}
3636
env:
@@ -41,13 +41,16 @@ jobs:
4141
with:
4242
ocaml-compiler: ${{ matrix.ocaml-compiler }}
4343

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

4848
- name: Install dependencies
4949
run: opam install . --deps-only --locked --with-test
5050

51+
- name: Install os gem for operating system detection
52+
run: sudo gem install os
53+
5154
- name: Build
5255
run: ./make.sh nat
5356

@@ -57,7 +60,7 @@ jobs:
5760
- name: Test
5861
run: opam exec -- dune runtest
5962

60-
- uses: actions/upload-artifact@v4
63+
- uses: actions/upload-artifact@v5
6164
if: always()
6265
with:
6366
name: suite_result-${{ matrix.os }}
@@ -79,7 +82,7 @@ jobs:
7982

8083
steps:
8184
- name: Checkout code
82-
uses: actions/checkout@v4
85+
uses: actions/checkout@v5
8386

8487
- name: Set up OCaml ${{ matrix.ocaml-compiler }}
8588
env:
@@ -90,7 +93,7 @@ jobs:
9093
with:
9194
ocaml-compiler: ${{ matrix.ocaml-compiler }}
9295

93-
- name: Install graph-easy # TODO: remove if depext --with-test works
96+
- name: Install graph-easy # TODO: remove if depext --with-test works (https://github.com/ocaml/opam/issues/5836)
9497
if: ${{ matrix.os == 'ubuntu-22.04' }}
9598
run: sudo apt install -y libgraph-easy-perl
9699

@@ -100,60 +103,11 @@ jobs:
100103
- name: Install dependencies
101104
run: opam install . --deps-only --locked --with-test
102105

106+
- name: Install os gem for operating system detection
107+
run: sudo gem install os
108+
103109
- name: Build
104110
run: ./make.sh nat
105111

106112
- name: Test extraction
107113
run: opam exec -- dune runtest tests/extraction
108-
109-
110-
gobview:
111-
strategy:
112-
fail-fast: false
113-
matrix:
114-
os:
115-
- ubuntu-22.04 # https://github.com/ocaml/setup-ocaml/issues/872
116-
ocaml-compiler:
117-
- ocaml-variants.4.14.2+options,ocaml-option-flambda # matches opam lock file
118-
# don't add any other because they won't be used
119-
node-version:
120-
- 14
121-
122-
runs-on: ${{ matrix.os }}
123-
124-
steps:
125-
- name: Checkout code
126-
uses: actions/checkout@v4
127-
128-
- name: Set up OCaml ${{ matrix.ocaml-compiler }}
129-
env:
130-
# otherwise setup-ocaml pins non-locked dependencies
131-
# https://github.com/ocaml/setup-ocaml/issues/166
132-
OPAMLOCKED: locked
133-
uses: ocaml/setup-ocaml@v3
134-
with:
135-
ocaml-compiler: ${{ matrix.ocaml-compiler }}
136-
137-
- name: Set up Node.js ${{ matrix.node-version }}
138-
uses: actions/setup-node@v4
139-
with:
140-
node-version: ${{ matrix.node-version }}
141-
142-
- name: Install dependencies
143-
run: opam install . --deps-only --locked
144-
145-
- name: Setup Gobview
146-
run: ./make.sh setup_gobview
147-
148-
- name: Build
149-
run: ./make.sh nat
150-
151-
- name: Build Gobview
152-
run: ./make.sh view
153-
154-
- name: Install selenium
155-
run: pip3 install selenium webdriver-manager
156-
157-
- name: Test Gobview
158-
run: |
159-
python3 scripts/test-gobview.py

‎.github/workflows/metadata.yml‎

Lines changed: 3 additions & 3 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@v4
22+
uses: actions/checkout@v5
2323

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

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

4444
- name: Set up Node.js ${{ matrix.node-version }}
45-
uses: actions/setup-node@v4
45+
uses: actions/setup-node@v6
4646
with:
4747
node-version: ${{ matrix.node-version }}
4848

‎.github/workflows/options.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515

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

2020
- name: Set up Node.js ${{ matrix.node-version }}
21-
uses: actions/setup-node@v4
21+
uses: actions/setup-node@v6
2222
with:
2323
node-version: ${{ matrix.node-version }}
2424

‎.github/workflows/semgrep.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ jobs:
1616

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

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

2424
- name: Upload SARIF file to GitHub Advanced Security Dashboard
25-
uses: github/codeql-action/upload-sarif@v3
25+
uses: github/codeql-action/upload-sarif@v4
2626
with:
2727
sarif_file: semgrep.sarif
2828
if: always()

0 commit comments

Comments
 (0)