From b1775c3138e59b2745ff2f31c8b877df048aebf6 Mon Sep 17 00:00:00 2001
From: Mykhailo Kuznietsov <mkuznets@redhat.com>
Date: Thu, 28 Mar 2024 14:49:29 +0200
Subject: [PATCH] chore: update DWO version for main branch during release
 (#2709)

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

diff --git a/make-release.sh b/make-release.sh
index 145e765569..044d78f876 100755
--- a/make-release.sh
+++ b/make-release.sh
@@ -66,15 +66,15 @@ updateYaml() {
     return 1
   else
     if [[ $(git rev-parse --abbrev-ref HEAD) == *"${BRANCH}"* ]]; then
-        # special fields for updating PR for 7.x.y branch
-        git clone https://github.com/devfile/devworkspace-operator /tmp/dwo
-        pushd /tmp/dwo
-            DWO_VERSION=$(git describe --tags $(git rev-list --tags --max-count=1) )
-        popd
         replaceFieldSed $playbookfile 'version' "${BRANCH}"
         replaceFieldSed $playbookfile 'prerelease' "false"
         replaceFieldSed $playbookfile '    devworkspace-operator-version-patch' "\"${DWO_VERSION#v}\""
     fi
+    # special fields for updating PR for 7.x.y branch
+    git clone https://github.com/devfile/devworkspace-operator /tmp/dwo
+    pushd /tmp/dwo
+        DWO_VERSION=$(git describe --tags $(git rev-list --tags --max-count=1) )
+    popd
     replaceFieldSed $playbookfile '    prod-ver' "\"${BASE1}.${BASE2}\""
     replaceFieldSed $playbookfile '    prod-ver-patch' "\"$NEWVERSION\""
   fi