From 4f679a87f30e9bdb99539a0eeb65d396b2614fc9 Mon Sep 17 00:00:00 2001 From: Aron Price Date: Thu, 5 Mar 2026 10:08:27 -0500 Subject: [PATCH] fix(ci): allow stable version alignment on premain promotion --- scripts/verify-version-alignment.sh | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/scripts/verify-version-alignment.sh b/scripts/verify-version-alignment.sh index 97a0e80..5f8f23d 100644 --- a/scripts/verify-version-alignment.sh +++ b/scripts/verify-version-alignment.sh @@ -83,10 +83,10 @@ if [[ -z "${expected}" ]]; then fi if [[ "${observed_version}" != "${expected}" ]]; then - # When merging prerelease work into `main`, allow checks to validate against the `premain` prerelease manifest. - # This prevents false failures during promotion PRs and the immediate post-merge push; the subsequent main - # release PR will enforce stable alignment. if [[ "${branch}" == "main" && "${observed_version}" == *"-rc"* && -f ".release-please-manifest.premain.json" ]]; then + # Promotion PRs (premain -> main) and immediate post-merge pushes may still carry prerelease versions. + # Allow alignment against the premain prerelease manifest; the subsequent release PR on `main` will + # enforce stable alignment. expected="$( python3 - < premain) and immediate post-merge pushes start from the latest stable + # baseline. Allow alignment against the stable manifest; the subsequent prerelease PR on `premain` + # will bump versions and enforce prerelease alignment. + expected="$( + python3 - <