Skip to content

Commit a9c9eb7

Browse files
committed
Revert "Merge remote-tracking branch 'upstream/master' into relationalArray"
This reverts commit 9a033b4.
1 parent 97edbd7 commit a9c9eb7

462 files changed

Lines changed: 6249 additions & 9522 deletions

File tree

Some content is hidden

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

.github/workflows/coverage.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@ jobs:
6565
- name: Test apron regression (Mukherjee et. al SAS '17 paper') # skipped by default but CI has apron, so explicitly test group (which ignores skipping -- it's now a feature!)
6666
run: ruby scripts/update_suite.rb group apron-mukherjee -s
6767

68-
- name: Test apron termination regression # skipped by default but CI has apron, so explicitly test group (which ignores skipping -- it's now a feature!)
69-
run: ruby scripts/update_suite.rb group termination -s
70-
7168
- name: Test regression cram
7269
run: opam exec -- dune runtest tests/regression
7370

@@ -88,7 +85,7 @@ jobs:
8885
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
8986
PULL_REQUEST_NUMBER: ${{ github.event.number }}
9087

91-
- uses: actions/upload-artifact@v4
88+
- uses: actions/upload-artifact@v3
9289
if: always()
9390
with:
9491
name: suite_result

.github/workflows/docs.yml

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

4747
- name: Setup Pages
4848
id: pages
49-
uses: actions/configure-pages@v4
49+
uses: actions/configure-pages@v3
5050

5151
- name: Install dependencies
5252
run: opam install . --deps-only --locked --with-doc
@@ -68,4 +68,4 @@ jobs:
6868
steps:
6969
- name: Deploy to GitHub Pages
7070
id: deployment
71-
uses: actions/deploy-pages@v3
71+
uses: actions/deploy-pages@v2

.github/workflows/locked.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,6 @@ jobs:
6464
- name: Test apron regression (Mukherjee et. al SAS '17 paper') # skipped by default but CI has apron, so explicitly test group (which ignores skipping -- it's now a feature!)
6565
run: ruby scripts/update_suite.rb group apron-mukherjee -s
6666

67-
- name: Test apron termination regression # skipped by default but CI has apron, so explicitly test group (which ignores skipping -- it's now a feature!)
68-
run: ruby scripts/update_suite.rb group termination -s
69-
7067
- name: Test regression cram
7168
run: opam exec -- dune runtest tests/regression
7269

@@ -82,10 +79,10 @@ jobs:
8279
- name: Test incremental regression with cfg comparison
8380
run: ruby scripts/update_suite.rb -c
8481

85-
- uses: actions/upload-artifact@v4
82+
- uses: actions/upload-artifact@v3
8683
if: always()
8784
with:
88-
name: suite_result-${{ matrix.os }}
85+
name: suite_result
8986
path: tests/suite_result/
9087

9188
extraction:
@@ -156,7 +153,7 @@ jobs:
156153
ocaml-compiler: ${{ matrix.ocaml-compiler }}
157154

158155
- name: Set up Node.js ${{ matrix.node-version }}
159-
uses: actions/setup-node@v4
156+
uses: actions/setup-node@v3
160157
with:
161158
node-version: ${{ matrix.node-version }}
162159

.github/workflows/metadata.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ jobs:
2727
args: --validate
2828

2929
zenodo-validate:
30-
# Zenodo schema URL is dead
31-
if: ${{ false }}
32-
3330
strategy:
3431
matrix:
3532
node-version:
@@ -42,7 +39,7 @@ jobs:
4239
uses: actions/checkout@v4
4340

4441
- name: Set up Node.js ${{ matrix.node-version }}
45-
uses: actions/setup-node@v4
42+
uses: actions/setup-node@v3
4643
with:
4744
node-version: ${{ matrix.node-version }}
4845

.github/workflows/options.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@ jobs:
1818
uses: actions/checkout@v4
1919

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

2525
- name: Install ajv-cli
2626
run: npm install -g ajv-cli
2727

2828
- name: Migrate schema # https://github.com/ajv-validator/ajv-cli/issues/199
29-
run: ajv migrate -s src/config/options.schema.json
29+
run: ajv migrate -s src/common/util/options.schema.json
3030

3131
- name: Validate conf
32-
run: ajv validate -s src/config/options.schema.json -d "conf/**/*.json"
32+
run: ajv validate -s src/common/util/options.schema.json -d "conf/**/*.json"
3333

3434
- name: Validate incremental tests
35-
run: ajv validate -s src/config/options.schema.json -d "tests/incremental/*/*.json"
35+
run: ajv validate -s src/common/util/options.schema.json -d "tests/incremental/*/*.json"

.github/workflows/semgrep.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
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@v2
2626
with:
2727
sarif_file: semgrep.sarif
2828
if: always()

.github/workflows/unlocked.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,6 @@ jobs:
9292
if: ${{ matrix.apron }}
9393
run: ruby scripts/update_suite.rb group apron-mukherjee -s
9494

95-
- name: Test apron termination regression # skipped by default but CI has apron, so explicitly test group (which ignores skipping -- it's now a feature!)
96-
if: ${{ matrix.apron }}
97-
run: ruby scripts/update_suite.rb group termination -s
98-
9995
- name: Test regression cram
10096
run: opam exec -- dune runtest tests/regression
10197

@@ -160,8 +156,7 @@ jobs:
160156

161157
- name: Downgrade dependencies
162158
# must specify ocaml-base-compiler again to prevent it from being downgraded
163-
# prevent num downgrade to avoid dune/jbuilder error: https://github.com/ocaml/dune/issues/5280
164-
run: opam install $(opam exec -- opam-0install --prefer-oldest goblint ocaml-variants.4.14.0+options ocaml-option-flambda num.1.4)
159+
run: opam install $(opam exec -- opam-0install --prefer-oldest goblint ocaml-variants.4.14.0+options ocaml-option-flambda)
165160

166161
- name: Build
167162
run: ./make.sh nat

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ linux-headers
2929
.goblint*/
3030
goblint_temp_*/
3131

32+
src/spec/graph
3233
.vagrant
3334

3435
g2html.jar

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@
44
[submodule "g2html"]
55
path = g2html
66
url = https://github.com/goblint/g2html.git
7+
[submodule "gobview"]
8+
path = gobview
9+
url = https://github.com/goblint/gobview.git

.mailmap

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ Kerem Çakırer <kcakirer@hotmail.com> <cakirerkerem@gmail.com>
2323
Sarah Tilscher <66023521+stilscher@users.noreply.github.com>
2424
Karoliine Holter <karoliine.holter@ut.ee>
2525
<karoliine.holter@ut.ee> <44437975+karoliineh@users.noreply.github.com>
26-
<karoliine.holter@ut.ee> <karoliine.holter@hotmail.com>
2726

2827
Elias Brandstetter <brandste@in.tum.de> <15275491+superbr4in@users.noreply.github.com>
2928
wherekonshade <wherekonshade@web.de> <80516286+Wherekonshade@users.noreply.github.com>
@@ -38,6 +37,3 @@ Mireia Cano Pujol <mcanopujol@gmail.com>
3837
Felix Krayer <felix@krayernet.eu>
3938
Felix Krayer <felix@krayernet.eu> <91671586+FelixKrayer@users.noreply.github.com>
4039
Manuel Pietsch <manuelpietsch@outlook.de>
41-
Tim Ortel <100865202+TimOrtel@users.noreply.github.com>
42-
Tomáš Dacík <xdacik00@stud.fit.vutbr.cz>
43-
<xdacik00@stud.fit.vutbr.cz> <43824605+TDacik@users.noreply.github.com>

0 commit comments

Comments
 (0)