Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .github/bdd-parts.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@
"MD-10",
"MD-11",
"MD-12",
"MD-13",
"PX-01",
"PX-02",
"PX-03",
Expand Down Expand Up @@ -277,6 +278,31 @@
],
"bootstrap-manifest-text": [
"BS-34"
],
"stdlib": [
"EX-09",
"SL-01",
"SL-02",
"SL-03",
"SL-04",
"SL-05",
"SL-09",
"SL-10",
"SL-11",
"SL-13",
"SL-14"
],
"language-models": [
"LM-01",
"LM-02",
"LM-03",
"LM-04",
"LM-05",
"LM-06",
"LM-07",
"LM-08",
"LM-09",
"LM-13"
]
},
"targets": {
Expand Down
2 changes: 1 addition & 1 deletion .github/intel-host-lanes.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"lower": ["bootstrap-lower", "bootstrap-lexicon-lse", "bootstrap-lexicon-lre", "bootstrap-surface-module", "bootstrap-diagnostics", "bootstrap-cli-output"],
"print": ["bootstrap-print", "bootstrap-bodies", "bootstrap-succeed", "bootstrap-loops", "bootstrap-assemble", "bootstrap-package", "bootstrap-check", "bootstrap-gnaf", "bootstrap-runtime", "bootstrap-terms", "bootstrap-tooling-latex", "bootstrap-structural-grammar", "bootstrap-surface-lex", "bootstrap-surface-doc", "bootstrap-surface-generic", "bootstrap-surface-tooling", "bootstrap-lock-text", "bootstrap-content-id", "bootstrap-project-text", "bootstrap-manifest-text"],
"validate": ["bootstrap-validate", "compiler", "preservation", "preservation-lists", "preservation-runtime", "preservation-support", "preservation-prims", "preservation-std", "production"],
"moves": ["bootstrap-moves", "verification", "rest"]
"moves": ["bootstrap-moves", "verification", "rest", "stdlib", "language-models"]
}
}
20 changes: 19 additions & 1 deletion .github/vv-rows.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{
"part": "examples",
"recipes": "examples",
"examples_part": "without:uor-atlas",
"examples_part": "without:uor-atlas,bootstrap",
"bdd_part": "",
"width": "2",
"memory_kib": "12582912",
Expand Down Expand Up @@ -358,5 +358,23 @@
"width": "",
"memory_kib": "",
"hints": ""
},
{
"part": "bdd-stdlib",
"recipes": "bdd",
"examples_part": "",
"bdd_part": "stdlib",
"width": "",
"memory_kib": "",
"hints": ""
},
{
"part": "bdd-language-models",
"recipes": "bdd",
"examples_part": "",
"bdd_part": "language-models",
"width": "",
"memory_kib": "",
"hints": ""
}
]
33 changes: 27 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
# the exact pinned toolchains and no build cache: §9.4 says "from a clean
# checkout", and a restored target directory is not one. CI runs its twelve
# recipes as the legs of `.github/vv-rows.json` at once, each its own clean
# checkout: `examples`, which here verifies every example but UOR Atlas, and
# checkout: `examples`, which here verifies every example but UOR Atlas and
# the bootstrap project (the `bootstrap export` job verifies it), and
# `honesty`, format/model/spec-links and the BDD meta target first, then
# `rest`, the remaining recipes in order, with the `bdd` rows below.
# Together they run every recipe of `vv` exactly once, so the gate is the same
Expand Down Expand Up @@ -199,7 +200,12 @@ jobs:
# its cases first needs it, and the harness checks the record against the
# leg's own run and checkout and replays the bundle before the case reads
# it. The legs start when honesty passes, as before, and wait only at that
# point; the artifact is read by this run alone.
# point; the artifact is read by this run alone. The export verifies the
# bootstrap project through the same `verify` the `examples` recipe runs,
# so this job is also that project's part of the recipe: it formats, locks,
# checks, and builds a clean copy first, and holds the export's verified
# directory to the recipe's checks after, and the `examples` leg does not
# verify the project again.
bootstrap-export:
name: bootstrap export
needs: [plan, honesty]
Expand Down Expand Up @@ -250,6 +256,15 @@ jobs:
sample_pid=$!
trap 'kill "$sample_pid" 2>/dev/null || true; wait "$sample_pid" 2>/dev/null || true' EXIT
cargo xtask export-bootstrap --output "$RUNNER_TEMP/bootstrap-export" 2>&1 | tee ci-evidence/vv.txt
# The bootstrap project's part of the `examples` recipe (§9.4), made
# visible as the Atlas join makes Atlas's: the leg names it in its part
# and does not verify it.
- name: Assert the export verified the bootstrap example
shell: bash
run: |
set -euo pipefail
grep -F "verify-examples: bootstrap verified (attestation " ci-evidence/vv.txt
grep -E "^verify-examples: bootstrap: [0-9]+ normalized verification records equal expected/verify " ci-evidence/vv.txt
- name: Summarize the run's timing and memory
if: ${{ !cancelled() }}
run: cargo xtask ci-summary --evidence ci-evidence
Expand Down Expand Up @@ -390,8 +405,10 @@ jobs:
# These assertions make its complete proof run visible as first-class CI
# evidence without running the expensive verifier a second time.
# The leg that runs `examples` is chosen by the matrix, not by the log,
# so a leg that should have verified Atlas and did not fails here.
- name: Assert the leg verified every example but Atlas
# so a leg that should have verified the examples and did not fails
# here, as does one that verified Atlas or the bootstrap project, which
# their own jobs verify.
- name: Assert the leg verified every example but Atlas and bootstrap
shell: bash
run: |
set -euo pipefail
Expand All @@ -402,6 +419,10 @@ jobs:
echo "::error::the examples leg verified Atlas, which the Atlas jobs verify as parts (SPEC.md §9.4)"
exit 1
fi
if grep -F "verify-examples: bootstrap" ci-evidence/vv.txt; then
echo "::error::the examples leg verified the bootstrap project, which the bootstrap export verifies (SPEC.md §9.4)"
exit 1
fi
;;
esac
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
Expand Down Expand Up @@ -1251,7 +1272,7 @@ jobs:
intel-join:
name: build and non-Lean tests (x86_64-apple-darwin)
needs: [plan, intel-construction, intel-part]
if: ${{ always() && needs.plan.outputs.intel == 'true' }}
if: ${{ !cancelled() && needs.plan.outputs.intel == 'true' }}
runs-on: ubuntu-24.04
timeout-minutes: 15
steps:
Expand Down Expand Up @@ -1333,7 +1354,7 @@ jobs:
windows-join:
name: build and non-Lean tests (x86_64-pc-windows-msvc)
needs: [plan, windows-part]
if: ${{ always() && needs.plan.outputs.full == 'true' }}
if: ${{ !cancelled() && needs.plan.outputs.full == 'true' }}
runs-on: ubuntu-24.04
timeout-minutes: 15
steps:
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,19 @@ workspace carried at those versions without a tag.
person merges a cut. `tag.yml` still tags a person's merge of a cut, and
accepts the run that verified a merged head's tree without waiting for the
merge's own.
- The whole gate verifies the bootstrap project once (SPEC.md §9.4). The
`bootstrap export` job, whose export already verified it whole through the
`examples` recipe's own `verify`, is now that project's part of the recipe:
`export-bootstrap` formats, locks, checks and builds a clean copy first and
then holds the export's verified directory to the recipe's checks (no
telemetry, records equal to `bootstrap/expected/verify`). The `examples` leg
runs `without:uor-atlas,bootstrap` and no longer spends about 53 minutes
verifying the project a second time; `LEXLEAN_EXAMPLES_PART=without:` takes
a comma-separated list. `RP-14` pins the job's assertion and the leg's.
- The Intel and Windows aggregates no longer run in a run that was cancelled
(a newer push to the pull request), so a superseded head no longer reports
a failed host context; they still run after a failed or cancelled lane of a
run that goes on (SPEC.md §8.3, `RP-14`).
- Decision regions (SPEC.md §17.12, `PF-24`, UOR-Foundation/PrismPM#605; no
new diagnostic code; changes the language-1.2 identity). The runtime gains a
sixth native module, `LexLeanRuntime.Regions`: a checker of local box
Expand Down
Loading
Loading