From e67cd05d6d40f8de74633dc4e82e3cffd0913456 Mon Sep 17 00:00:00 2001
From: Mykhailo Kuznietsov <mkuznets@redhat.com>
Date: Thu, 25 Mar 2021 12:26:37 +0200
Subject: [PATCH] Bump version during release in the beginning (#19395)

Signed-off-by: Mykhailo Kuznietsov <mkuznets@redhat.com>
---
 make-release.sh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/make-release.sh b/make-release.sh
index 70d87e3936..0de2a4db17 100755
--- a/make-release.sh
+++ b/make-release.sh
@@ -456,6 +456,14 @@ setupGitconfig
 evaluateCheVariables
 
 checkoutProjects
+
+if [[ "${BUMP_NEXT_VERSION}" = "true" ]]; then
+    bumpVersions
+    updateImageTagsInCheServer
+    # checkout back to branches to make release from
+    checkoutProjects
+fi
+
 if [[ "${REBUILD_FROM_EXISTING_TAGS}" = "true" ]]; then
     echo "[INFO] Checking out from existing ${CHE_VERSION} tag"
     checkoutTags
@@ -471,8 +479,3 @@ if [[ "${BUILD_AND_PUSH_IMAGES}" = "true" ]]; then
     tagLatestImages ${CHE_VERSION}
     pushImagesOnQuay ${CHE_VERSION} pushLatest
 fi
-
-if [[ "${BUMP_NEXT_VERSION}" = "true" ]]; then
-    bumpVersions
-    updateImageTagsInCheServer
-fi