From c38baa9d609f86dd64b7dfa6c7d7857685081254 Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 19 Oct 2026 16:37:04 +0200 Subject: [PATCH 1/2] chore: sync package version with crates.io (0.1.73); commit Release version bump Release published up to 0.1.73 with --allow-dirty and never committed the [package] version bump, so main stayed at 0.1.13. Set main to the crates.io max and add a Release step (after a successful publish) that commits only the [package] version line as 'Bump version to X for release [skip ci]', matching blvm-consensus. --- .github/workflows/ci.yml | 39 +++++++++++++++++++++++++++++++++++++++ Cargo.toml | 2 +- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 56984f4e..2c8e6025 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1389,6 +1389,45 @@ jobs: env: CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} + # Commit the [package] version bump back to main (same commit message as blvm-consensus). + # Only after a successful publish, and only the [package] version line: the release + # Cargo.toml on disk also has crates.io dependency pins and a stripped [patch.crates-io], + # which must not land on main. The working tree is left untouched (publish already ran). + - name: Commit Cargo.toml version bump + if: steps.publish.outputs.published == 'true' + env: + REPO_ACCESS_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }} + run: | + VERSION="${{ steps.version.outputs.version }}" + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" + + git show HEAD:Cargo.toml | awk -v ver="$VERSION" ' + /^\[package\]/ { in_package = 1; print; next } + /^\[/ { in_package = 0 } + in_package && /^version = / { + print "version = \"" ver "\"" + next + } + { print } + ' > "${RUNNER_TEMP}/Cargo.toml.bump" + BLOB=$(git hash-object -w "${RUNNER_TEMP}/Cargo.toml.bump") + git update-index --cacheinfo "100644,${BLOB},Cargo.toml" + + if git diff --cached --quiet; then + echo "No version change to commit in Cargo.toml" + exit 0 + fi + git commit -m "Bump version to ${VERSION} for release [skip ci]" || true + + if [ -n "${REPO_ACCESS_TOKEN}" ]; then + git config --local --unset-all 'http.https://github.com/.extraheader' 2>/dev/null || true + git remote set-url origin "https://x-access-token:${REPO_ACCESS_TOKEN}@github.com/${GITHUB_REPOSITORY}.git" + git -c credential.helper= push origin HEAD:${{ github.ref }} || true + else + echo "⚠️ REPO_ACCESS_TOKEN not set, skipping push" + fi + - name: Verify published crate is available if: | env.CARGO_REGISTRY_TOKEN != '' && diff --git a/Cargo.toml b/Cargo.toml index e2c414c8..bb04c6af 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "blvm-node" -version = "0.1.13" +version = "0.1.73" edition = "2024" authors = ["Bitcoin Commons Team"] description = "Bitcoin Commons BLVM: Minimal Bitcoin node implementation using blvm-protocol and blvm-consensus" From 482e0ca33a2a012b8a66c5bfc9197816dc44a829 Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 19 Oct 2026 16:44:04 +0200 Subject: [PATCH 2/2] ci: run PR checks The previous commit message quoted the release skip marker, which made GitHub skip the pull_request workflows for that head.