diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b326c11365..cdd61b0769 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,10 +62,6 @@ jobs: with: path: | .lake - - name: Verify Java testdata is up to date - run: | - StrataTestExtra/Languages/Java/regenerate-testdata.sh - git diff --exit-code StrataTestExtra/Languages/Java/testdata/ lint_checks: name: Run lint checks @@ -134,8 +130,14 @@ jobs: - name: Check for broken links uses: lycheeverse/lychee-action@v2 with: - args: --offline --no-progress --exclude-path '.*/find/.*' docs/verso/_out/ + args: --offline --no-progress --exclude-path '.*/find/.*' --exclude-path '.*/html-multi/.*' docs/verso/_out/ fail: true + - name: Check for broken links (html-multi) + run: | + for dir in docs/verso/_out/*/html-multi; do + lychee --offline --no-progress --exclude-path '.*/find/.*' --exclude-path '.*\.css$' \ + --base-url "file://$PWD/$dir/" "$dir/" || exit 1 + done cbmc: needs: build_and_test_lean diff --git a/lake-manifest.json b/lake-manifest.json index 36588d4083..6610b7f3a8 100644 --- a/lake-manifest.json +++ b/lake-manifest.json @@ -15,7 +15,7 @@ "type": "git", "subDir": null, "scope": "", - "rev": "4ea13cd3ef6e6e0bc70629ef818155c808c47320", + "rev": "c6393bb5c20e687b37a691367c035daf17361573", "name": "StrataDDM", "manifestFile": "lake-manifest.json", "inputRev": "main", diff --git a/lakefile.toml b/lakefile.toml index c8839ed3ff..d7fd4be532 100644 --- a/lakefile.toml +++ b/lakefile.toml @@ -1,6 +1,6 @@ name = "Strata" version = "0.1.0" -defaultTargets = ["Strata", "StrataToCBMC", "StrataCoreToGoto"] +defaultTargets = ["Strata", "StrataToCBMC", "StrataCoreToGoto", "laurelJavaGen"] testDriver = "StrataTestMain" lintDriver = "CheckImports" @@ -19,6 +19,7 @@ rev = "bump_to_v4.29.0-rc8" [[lean_lib]] name = "Strata" +moreLeancArgs = ["-fbracket-depth=512"] [[lean_lib]] name = "StrataExamples" @@ -34,9 +35,9 @@ root = "Scripts.StrataTestMain" # `Strata` is listed explicitly because the driver spawns `lean` on files # under `StrataTestExtra/` (which is not a `lean_lib`). Those files import # modules from the `Strata` library that are not in `StrataTest`'s transitive -# closure (e.g., `Strata.DDM.Integration.Java`), so without this the oleans -# would be missing when running `lake test` from a clean `.lake`. -needs = ["Strata", "StrataTest"] +# closure (e.g., `Strata.Java.Gen`), so without this the oleans would be +# missing when running `lake test` from a clean `.lake`. +needs = ["Strata", "StrataTest", "laurelJavaGen"] [[lean_exe]] name = "StrataToCBMC" @@ -55,3 +56,7 @@ root = "Scripts.ImportStats" [[lean_exe]] name = "GenerateEmbedded" root = "Scripts.GenerateEmbedded" + +[[lean_exe]] +name = "laurelJavaGen" +root = "Scripts.LaurelJavaGen"