From 9e5f0f1d7f36a532c32aff3e1272bc6abee60961 Mon Sep 17 00:00:00 2001
From: Mykhailo Kuznietsov <mkuznets@redhat.com>
Date: Tue, 9 Apr 2024 13:59:48 +0300
Subject: [PATCH] chore: fix automatic DWO version update (#2715)

Signed-off-by: Mykhailo Kuznietsov <mkuznets@redhat.com>
---
 antora.yml      | 2 +-
 make-release.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/antora.yml b/antora.yml
index cc561c1daa..d670fde871 100644
--- a/antora.yml
+++ b/antora.yml
@@ -25,7 +25,7 @@ asciidoc:
     # for the project
     che-plugin-registry-directory: che-plugin-registry
     devworkspace-operator-index-disconnected-install: quay.io/devfile/devworkspace-operator-index:release-digest
-    devworkspace-operator-version-patch: "0.25.0"
+    devworkspace-operator-version-patch: "0.26.0"
     devworkspace: DevWorkspace
     devworkspace-id: devworkspace
     docker-cli: docker
diff --git a/make-release.sh b/make-release.sh
index 044d78f876..85a272c3c3 100755
--- a/make-release.sh
+++ b/make-release.sh
@@ -68,13 +68,13 @@ updateYaml() {
     if [[ $(git rev-parse --abbrev-ref HEAD) == *"${BRANCH}"* ]]; then
         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 '    devworkspace-operator-version-patch' "\"${DWO_VERSION#v}\""
     replaceFieldSed $playbookfile '    prod-ver' "\"${BASE1}.${BASE2}\""
     replaceFieldSed $playbookfile '    prod-ver-patch' "\"$NEWVERSION\""
   fi