gsarantid / cloudbeat

76%

main: 76%

LAST BUILD ON BRANCH fix-minor-bump-idempotency

branch: fix-minor-bump-idempotency

CHANGE BRANCH

x

Reset

Sync Branches

• fix-minor-bump-idempotency
• 9.5
• bump-to-9.5.0
• bump-to-9.6.0
• bump-to-9.9.9
• main
• remove-mergify-version-bump-auto-merge

Build # 29004734414

Build Type

Pull #5

github

Committed by cloudsecmachine

Commit Message

fix: make bump-minor.sh idempotent on retrigger

When Nina retriggered the centralized version-bump pipeline yesterday
after our 9.5.0 bump had already succeeded, cloudbeat-version-bump #36
re-ran bump-minor.sh with the same env vars (NEW_VERSION=9.5.0). At that
point main was at 9.6.0 (from #7268), and the sed inside
update_version_beat happily rewrote version.go from 9.6.0 back to
9.5.0. The existing no_new_commits guard couldn't tell the difference
between "advance forward" and "regress backward" — it only asks "did
anything change vs main?" — so the regression commits passed the check
and the script pushed the resulting PR #7275 (now closed).

Two-layer fix:

1. bump-minor.sh: top-level guard. If main is already at
   next_minor_version(NEW_VERSION) (e.g. main=9.6.0 while
   NEW_VERSION=9.5.0), the entire bump has already completed. Exit 0
   before touching any files.

2. common.sh: new is_downgrade() helper (using sort -V so
   9.10.0 > 9.9.0 works correctly). update_version_beat and
   update_arm_templates now call it before writing: if the current
   value is >= the target, they refuse the write and log a clear
   message. Belt-and-suspenders — even if a caller forgets the
   top-level guard, no downgrade can escape the shared helper.

bump-patch.sh and post-minor-merge.sh are unchanged; patch bumps only
ever advance forward, and post-minor-merge is already idempotent via
its branch-exists check plus no_new_commits.

Co-authored-by: Cursor <cursoragent@cursor.com>

Pull Request Pull Request #5: [fork smoke test] fix: make bump-minor.sh idempotent on retrigger

Coverage Stats

10205 of 13409 relevant lines covered (76.11%)

15.9 hits per line