Skip to content

Commit 254966d

Browse files
Fix: commit release bump before auto-bumping develop
1 parent 288a827 commit 254966d

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

.github/workflows/version-and-build.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ jobs:
7171
echo " First release push: Alpha → RC1"
7272
bump-my-version bump pre_label
7373
74+
# Commit the release branch bump before switching branches
75+
git commit -am "Bump to RC1 [skip ci]"
76+
git push
77+
7478
# Auto-bump develop to next minor
7579
echo ""
7680
RELEASE_VERSION="${BRANCH#release/}"
@@ -146,13 +150,17 @@ jobs:
146150
startsWith(github.ref, 'refs/heads/release/') ||
147151
startsWith(github.ref, 'refs/heads/hotfix/')
148152
run: |
153+
# Check if there are uncommitted changes
149154
if [[ -n $(git status -s) ]]; then
150155
git commit -am "Bump version to ${{ steps.version.outputs.version }} [skip ci]"
151-
git push
152156
echo "✅ Version bumped and committed"
153157
else
154158
echo "ℹ️ No version changes to commit"
155159
fi
160+
161+
# Push (whether we just committed or committed earlier)
162+
git push
163+
echo "✅ Pushed to remote"
156164
157165
- name: Create Git tag
158166
if: |

0 commit comments

Comments
 (0)