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
2 changes: 1 addition & 1 deletion .github/workflows/bootstrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
with:
path: .prism-proof
key: prism-proof-${{ runner.os }}-${{ runner.arch }}-sdk-${{ steps.proof-inputs.outputs.sdk }}-lean-${{ steps.proof-inputs.outputs.lean }}-${{ hashFiles('app/**', 'prismpm.lock', 'Justfile', 'rust-toolchain.toml') }}
key: prism-proof-${{ runner.os }}-${{ runner.arch }}-sdk-${{ steps.proof-inputs.outputs.sdk }}-lean-${{ steps.proof-inputs.outputs.lean }}-${{ hashFiles('app/**', '!app/specs/**', 'prismpm.lock', 'Justfile', 'rust-toolchain.toml') }}

- name: Reserve disk for the locked SDK
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion template.lock
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"contract_digest":"sha256:67a3292cfe6e6400bc18718b6a62e8741dec8d6d6b062cb0e4077fc8d9b616f5","policy_files":[{"path":".devcontainer/devcontainer.json","sha256":"sha256:77df0fd0a87ace0f9f71959055ffd05c14bcd3758f96c5ecf9d70ee6f376bf8f"},{"path":".github/workflows/bootstrap.yml","sha256":"sha256:197117436eb1d32a8d205e5897c50c92bed048bd47d8110a585c0e75c659757c"},{"path":"AGENTS.md","sha256":"sha256:9a1fe3f73ab2963812c35976909c331292e1ca39ce47c0711ec1aafe8b869d87"},{"path":"VERIFICATION.md","sha256":"sha256:0912821fea354276fff5faa2b6b6ded0cdf4ef86112ad035b41a0a7a0513bd21"},{"path":"prismpm.lock","sha256":"sha256:3dbd6a1bcb6f145f35f61e5e265495a1a6c9e071f4b2c6c89ae68f35eb600c02"},{"path":"template-contract.json","sha256":"sha256:67a3292cfe6e6400bc18718b6a62e8741dec8d6d6b062cb0e4077fc8d9b616f5"}],"policy_tree_sha256":"sha256:89db2bd9c079784e62dbb14dea622e7709b70e65fa86efec5b12a5d283b84075","schema":"uor/template-lock/1","sdk_image":"ghcr.io/afflom/prismpm-sdk-patched@sha256:3dfa5f7284ace57c08bfe8d2effe2e08ab41da1a53f5820d48cccd498bd528c3","template_repository":"https://github.com/UOR-Foundation/template","template_revision":"b82a30572334bdec00bfbc8d62cb248ecaee4055"}
{"contract_digest":"sha256:67a3292cfe6e6400bc18718b6a62e8741dec8d6d6b062cb0e4077fc8d9b616f5","policy_files":[{"path":".devcontainer/devcontainer.json","sha256":"sha256:77df0fd0a87ace0f9f71959055ffd05c14bcd3758f96c5ecf9d70ee6f376bf8f"},{"path":".github/workflows/bootstrap.yml","sha256":"sha256:633a66f526b0e855955b0d5bb9d5a1d13b94a788aa7187652110b22b9561c6f9"},{"path":"AGENTS.md","sha256":"sha256:9a1fe3f73ab2963812c35976909c331292e1ca39ce47c0711ec1aafe8b869d87"},{"path":"VERIFICATION.md","sha256":"sha256:0912821fea354276fff5faa2b6b6ded0cdf4ef86112ad035b41a0a7a0513bd21"},{"path":"prismpm.lock","sha256":"sha256:3dbd6a1bcb6f145f35f61e5e265495a1a6c9e071f4b2c6c89ae68f35eb600c02"},{"path":"template-contract.json","sha256":"sha256:67a3292cfe6e6400bc18718b6a62e8741dec8d6d6b062cb0e4077fc8d9b616f5"}],"policy_tree_sha256":"sha256:f0bfe7aae45c572d8bb34d88797604eaa15b67fd82151e87c69c640e559be8f4","schema":"uor/template-lock/1","sdk_image":"ghcr.io/afflom/prismpm-sdk-patched@sha256:3dfa5f7284ace57c08bfe8d2effe2e08ab41da1a53f5820d48cccd498bd528c3","template_repository":"https://github.com/UOR-Foundation/template","template_revision":"263b14a20f15bf1d320c7b716c33843fe05d4bde"}
2 changes: 1 addition & 1 deletion xtask/src/bootstrap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ fn native_coverage_is_complete(bootstrap: &str) -> bool {

/// The cache key: every proof input, the SDK image digest and the Lean
/// toolchain by value. A key that omits one would find a proof of other inputs.
const PROOF_KEY: &str = "key: prism-proof-${{ runner.os }}-${{ runner.arch }}-sdk-${{ steps.proof-inputs.outputs.sdk }}-lean-${{ steps.proof-inputs.outputs.lean }}-${{ hashFiles('app/**', 'prismpm.lock', 'Justfile', 'rust-toolchain.toml') }}";
const PROOF_KEY: &str = "key: prism-proof-${{ runner.os }}-${{ runner.arch }}-sdk-${{ steps.proof-inputs.outputs.sdk }}-lean-${{ steps.proof-inputs.outputs.lean }}-${{ hashFiles('app/**', '!app/specs/**', 'prismpm.lock', 'Justfile', 'rust-toolchain.toml') }}";

/// The step that names the SDK image digest and the Lean toolchain for the key.
const PROOF_INPUTS: [&str; 8] = [
Expand Down
6 changes: 3 additions & 3 deletions xtask/src/proof.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const EVIDENCE: [&str; 3] = [
"application-acceptance.json",
];
/// Every checked-in byte the proof reads, as bootstrap.yml's cache key names it.
const INPUT_PATHS: [&str; 4] = ["app", "prismpm.lock", "Justfile", "rust-toolchain.toml"];
const INPUT_PATHS: &str = "app :(exclude)app/specs prismpm.lock Justfile rust-toolchain.toml";

/// A kept proof, as read back from `.prism-proof`.
struct Kept {
Expand Down Expand Up @@ -240,14 +240,14 @@ fn inputs(root: &Path) -> Result<String, Fail> {
std::env::consts::ARCH,
);
let mut args = vec!["ls-files", "-z", "--"];
args.extend(INPUT_PATHS);
args.extend(INPUT_PATHS.split(' '));
let files = run(root, ".", "git", &args)?;
for path in files.split('\0').filter(|path| !path.is_empty()) {
let bytes = std::fs::read(root.join(path)).map_err(|error| format!("{path}: {error}"))?;
out.push_str(&format!("{} {path}\n", hex(&bytes)));
}
let mut args = vec!["status", "--porcelain=v1", "--untracked-files=all", "--"];
args.extend(INPUT_PATHS);
args.extend(INPUT_PATHS.split(' '));
out.push_str(&run(root, ".", "git", &args)?);
Ok(out)
}
Expand Down
Loading