From 73a9daef6b952a849485f3d0fb5322b66eca0dc2 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Mon, 31 Aug 2026 05:53:19 +0000 Subject: [PATCH] fix: stop the release version bump from re-resolving every dependency --- .github/change-versions.sh | 8 ++++++-- .github/workflows/change-versions.yml | 7 ------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/change-versions.sh b/.github/change-versions.sh index ffb73f6180..958829a3ce 100755 --- a/.github/change-versions.sh +++ b/.github/change-versions.sh @@ -20,11 +20,15 @@ sed -i -e "/^windmill-api =/s/= .*/= \"\\^$VERSION\"/" ${root_dirpath}/python-cl sed -i -e "/^[[:space:]]*ModuleVersion[[:space:]]*=/s/= .*/= '$VERSION'/" ${root_dirpath}/powershell-client/WindmillClient/WindmillClient.psd1 sed -i -e "/^wmill =/s/= .*/= \">=$VERSION\"/" ${root_dirpath}/lsp/Pipfile -sed -i -zE "s/name = \"windmill\"\nversion = \"[^\"]*\"\\n(.*)/name = \"windmill\"\nversion = \"$VERSION\"\\n\\1/" ${root_dirpath}/backend/Cargo.lock +# Every workspace member is named windmill*, so rewriting their entries in place +# keeps the lockfile consistent with Cargo.toml. Never regenerate it here: a +# release must not re-resolve third-party dependencies, or a `^0` requirement +# silently pulls a breaking 0.x bump into the tag that CI then fails to build. +sed -i -zE "s/(name = \"windmill[^\"]*\"\nversion = )\"[^\"]*\"/\\1\"$VERSION\"/g" ${root_dirpath}/backend/Cargo.lock # windmill-parser-wasm is its own workspace (excluded from the backend workspace # because of nightly-only cargo-features), so its version lives in -# [workspace.package] and its Cargo.lock is not regenerated by the backend step. +# [workspace.package]. sed -i -e "/^version =/s/= .*/= \"$VERSION\"/" ${root_dirpath}/backend/parsers/windmill-parser-wasm/Cargo.toml sed -i -zE "s/(name = \"windmill[^\"]*\"\nversion = )\"[^\"]*\"/\\1\"$VERSION\"/g" ${root_dirpath}/backend/parsers/windmill-parser-wasm/Cargo.lock diff --git a/.github/workflows/change-versions.yml b/.github/workflows/change-versions.yml index eea62bf6b7..a5ef274fa3 100644 --- a/.github/workflows/change-versions.yml +++ b/.github/workflows/change-versions.yml @@ -20,13 +20,6 @@ jobs: - run: git config --system --add safe.directory /__w/windmill/windmill - name: Change versions run: ./.github/change-versions.sh "$(cat version.txt)" - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - name: update lockfile - run: | - cd backend - cargo generate-lockfile - uses: stefanzweifel/git-auto-commit-action@v5 with: commit_user_name: windmill-internal-app[bot]