From 9143fbabe2a41f7547e82b41100296ceffc865b2 Mon Sep 17 00:00:00 2001 From: Michael Taylor Date: Tue, 14 Jul 2026 14:36:14 -0700 Subject: [PATCH 1/2] =?UTF-8?q?ci(release):=20nightlies=20polish=20?= =?UTF-8?q?=E2=80=94=20shortsha=20consistency=20+=20fixed=20.gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude --- .github/workflows/nightly-release.yml | 11 +++++++---- .gitignore | 3 ++- Cargo.lock | 18 +++++++++--------- Cargo.toml | 2 +- cliff.toml | 6 +++--- 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml index f2a4b701..770e58d0 100644 --- a/.github/workflows/nightly-release.yml +++ b/.github/workflows/nightly-release.yml @@ -205,6 +205,7 @@ jobs: version: ${{ steps.v.outputs.version }} dated_tag: ${{ steps.v.outputs.dated_tag }} title: ${{ steps.v.outputs.title }} + sha: ${{ steps.v.outputs.sha }} steps: - name: Require RELEASE_TOKEN (else no-op) id: token @@ -236,12 +237,14 @@ jobs: BASE="$(crg)" # e.g. 0.13.2 (the current Cargo.toml version) DATE="$(date -u +%Y%m%d)" # e.g. 20260714 (UTC) DATE_DASH="$(date -u +%Y-%m-%d)" # e.g. 2026-07-14 (UTC, for the human title) - SHA="$(git rev-parse --short HEAD)" + SHORTSHA="$(git rev-parse --short HEAD)" + FULLSHA="$(git rev-parse HEAD)" # Semver PRERELEASE version — sorts BELOW the plain `X.Y.Z`, so a nightly never outranks # the stable release of the same version. Built at CI time; never committed. - echo "version=${BASE}-nightly.${DATE}.${SHA}" >> "$GITHUB_OUTPUT" + echo "version=${BASE}-nightly.${DATE}.${SHORTSHA}" >> "$GITHUB_OUTPUT" echo "dated_tag=nightly-${DATE}" >> "$GITHUB_OUTPUT" - echo "title=Nightly ${DATE_DASH} (${SHA})" >> "$GITHUB_OUTPUT" + echo "title=Nightly ${DATE_DASH} (${SHORTSHA})" >> "$GITHUB_OUTPUT" + echo "sha=${FULLSHA}" >> "$GITHUB_OUTPUT" # 2) build: the SAME reusable cross-OS build the stable release uses, stamped with the nightly # version. Skipped (with the whole channel) when the token is absent. @@ -252,7 +255,7 @@ jobs: uses: ./.github/workflows/build-binaries.yml with: version: ${{ needs.nightly-meta.outputs.version }} - ref: "" # build this run's commit (main HEAD) + ref: ${{ needs.nightly-meta.outputs.sha }} # 3) publish: attach the built binaries to a dated + rolling PRE-release, then prune old # nightlies. Uses RELEASE_TOKEN for git tag + gh release operations (same identity as stable). diff --git a/.gitignore b/.gitignore index 0a666489..f5cbad43 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,5 @@ /.wp-doc-findings.md # Rendered whitepaper HTML intermediate (the .md source and .pdf are kept). /docs/whitepaper/digstore-whitepaper.html -.testcredentials \ No newline at end of file +.testcredentials +.claude/worktrees/ \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 4e82e28e..fc552f9d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2289,7 +2289,7 @@ dependencies = [ [[package]] name = "digstore-chain" -version = "0.13.2" +version = "0.13.3" dependencies = [ "aes-gcm", "anyhow", @@ -2327,7 +2327,7 @@ dependencies = [ [[package]] name = "digstore-chunker" -version = "0.13.2" +version = "0.13.3" dependencies = [ "digstore-core", "hex", @@ -2337,7 +2337,7 @@ dependencies = [ [[package]] name = "digstore-cli" -version = "0.13.2" +version = "0.13.3" dependencies = [ "anstream 0.6.21", "anstyle", @@ -2403,7 +2403,7 @@ dependencies = [ [[package]] name = "digstore-core" -version = "0.13.2" +version = "0.13.3" dependencies = [ "aes-gcm-siv", "hex", @@ -2500,7 +2500,7 @@ dependencies = [ [[package]] name = "digstore-remote" -version = "0.13.2" +version = "0.13.3" dependencies = [ "async-trait", "axum", @@ -3177,7 +3177,7 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ @@ -4378,7 +4378,7 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "p256" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" dependencies = [ @@ -5020,7 +5020,7 @@ dependencies = [ [[package]] name = "rcgen" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2" dependencies = [ @@ -5944,7 +5944,7 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ diff --git a/Cargo.toml b/Cargo.toml index 9b821ee1..1fcccc61 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ exclude = ["crates/digstore-prover/guest", "crates/dig-client-wasm"] [workspace.package] edition = "2021" -version = "0.13.2" +version = "0.13.3" license = "GPL-2.0-only" [workspace.dependencies] diff --git a/cliff.toml b/cliff.toml index dbe3a585..15464106 100644 --- a/cliff.toml +++ b/cliff.toml @@ -1,7 +1,7 @@ # git-cliff changelog config — builds CHANGELOG.md from Conventional Commits. -# Uniform across every DIG repo (Rust + JS/TS). Consumed by .github/workflows/release.yml, -# which regenerates the changelog on merge and commits it BEFORE tagging (so the changelog -# is included in the vX.Y.Z tag). See CLAUDE.md §3.6. +# Uniform across every DIG repo (Rust + JS/TS). Consumed by nightly-release.yml's stable +# channel (the nightly cron + manual dispatch), which regenerates the changelog + commits + tags. +# See CLAUDE.md §3.6. [changelog] header = """ # Changelog From 699cc7d53025649ca690e0aee2e13e7f24b5a316 Mon Sep 17 00:00:00 2001 From: Michael Taylor Date: Tue, 14 Jul 2026 14:50:30 -0700 Subject: [PATCH 2/2] =?UTF-8?q?fix(cargo):=20regenerate=20Cargo.lock=20?= =?UTF-8?q?=E2=80=94=20correct=20third-party=20deps=20(hashbrown,=20p256,?= =?UTF-8?q?=20rcgen,=20synstructure)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Revert hashbrown, p256, rcgen, and synstructure from incorrectly string-replaced 0.13.3 to correct 0.13.2. Properly regenerated lock via cargo update --workspace --offline. Co-Authored-By: Claude --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fc552f9d..83c546f0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3177,7 +3177,7 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.13.3" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ @@ -4378,7 +4378,7 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "p256" -version = "0.13.3" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" dependencies = [ @@ -5020,7 +5020,7 @@ dependencies = [ [[package]] name = "rcgen" -version = "0.13.3" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2" dependencies = [ @@ -5944,7 +5944,7 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.13.3" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [