From 0e78fe961af122181e090540438040b8301ce4bc Mon Sep 17 00:00:00 2001 From: Saul Shanabrook Date: Sun, 20 Sep 2026 05:55:53 -0700 Subject: [PATCH] Fix locked release builds after version bumps --- .github/workflows/version.yml | 13 ++++++++----- docs/changelog.md | 2 ++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml index 18ae1785..2d452a9e 100644 --- a/.github/workflows/version.yml +++ b/.github/workflows/version.yml @@ -36,10 +36,13 @@ jobs: version: ${{ steps.bump.outputs.version }} steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + - uses: dtolnay/rust-toolchain@ebb3d1676050bfd0971c36c1e215b5751473994d # 1.96.0 - run: | git config user.name github-actions[bot] git config user.email 41898282+github-actions[bot]@users.noreply.github.com - VERSION=$(python modify_changelog.py bump_version $TYPE) + VERSION=$(python modify_changelog.py bump_version "$TYPE") + # Update the workspace version without changing dependency pins. + cargo update --workspace git checkout -b "version-$VERSION" git commit -am "Version $VERSION" git push -u origin HEAD @@ -57,7 +60,7 @@ jobs: matrix: target: [aarch64, ppc64] needs: [bump] - if: ${{ always() }} + if: ${{ !cancelled() && (needs.bump.result == 'success' || needs.bump.result == 'skipped') }} steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 if: ${{ needs.bump.result == 'success' }} @@ -81,7 +84,7 @@ jobs: name: build linux runs-on: ubuntu-latest needs: [bump] - if: ${{ always() }} + if: ${{ !cancelled() && (needs.bump.result == 'success' || needs.bump.result == 'skipped') }} steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 if: ${{ needs.bump.result == 'success' }} @@ -110,7 +113,7 @@ jobs: matrix: python: ["3.12", "3.13", "3.14", "3.14t"] needs: [bump] - if: ${{ always() }} + if: ${{ !cancelled() && (needs.bump.result == 'success' || needs.bump.result == 'skipped') }} steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 if: ${{ needs.bump.result == 'success' }} @@ -135,7 +138,7 @@ jobs: name: build macos runs-on: macos-latest needs: [bump] - if: ${{ always() }} + if: ${{ !cancelled() && (needs.bump.result == 'success' || needs.bump.result == 'skipped') }} steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 if: ${{ needs.bump.result == 'success' }} diff --git a/docs/changelog.md b/docs/changelog.md index 6d741ce0..6054c071 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -4,6 +4,8 @@ _This project uses semantic versioning_ ## UNRELEASED +- Fix release version bumps to update `Cargo.lock` before building locked wheels. + - Modernize dependencies and CI [#425](https://github.com/egraphs-good/egglog-python/pull/425). - BREAKING: Drop Python 3.11 support; supported CPython versions are now 3.12-3.14. - Add beta support for free-threaded CPython 3.14t; see