This is an automated email from the ASF dual-hosted git repository.

pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git


The following commit(s) were added to refs/heads/main by this push:
     new 4196aef3 Update release-branch.sh
4196aef3 is described below

commit 4196aef317e79fc56f15d0ed9b9c60276f49cb58
Author: Pasquale Congiusti <pasquale.congiu...@gmail.com>
AuthorDate: Mon Jul 3 15:48:10 2023 +0200

    Update release-branch.sh
---
 scripts/release-branch.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/release-branch.sh b/scripts/release-branch.sh
index fe204826..f67c1547 100755
--- a/scripts/release-branch.sh
+++ b/scripts/release-branch.sh
@@ -34,8 +34,6 @@ main() {
 
   new_release_branch="release-$VERSION_MM.x"
   new_release="$(echo "$VERSION_MM" | tr \. _)_x"
-  # Create release branch
-  git checkout -b $new_release_branch
 
   # Support nightly CI tasks
   # pick the oldest release (we will replace it)
@@ -53,7 +51,9 @@ main() {
     git add --all
     git commit -m "chore: starting release branch for $new_release_branch" || 
true
     # We must push on main as well, as it contains the changes for CI workflows
-    git push --set-upstream origin main
+    git push 
+    # Create release branch
+    git checkout -b $new_release_branch
     git push --set-upstream origin $new_release_branch
     echo "🎉 Changes pushed correctly!"
   fi

Reply via email to