From b6d4e446f7a6e61b1fcce4055af692ac3f0c6365 Mon Sep 17 00:00:00 2001
From: Anatolii Bazko <abazko@redhat.com>
Date: Fri, 7 May 2021 12:16:18 +0300
Subject: [PATCH] Fix release script to check resources only once (#816)

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
---
 .github/workflows/release.yml |  2 +-
 make-release.sh               | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9f2659593..c909d9146 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -98,7 +98,7 @@ jobs:
 
           # we usually do not update nightly files during major releases
           if [[ ${CHE_VERSION} == *".0" ]]; then
-            ./make-release.sh ${CHE_VERSION} --release --release-olm-files --dev-workspace-controller-version ${DWO_VERSION} --dev-workspace-che-operator-version ${DWO_CHE_VERSION}
+            ./make-release.sh ${CHE_VERSION} --release --check-resources --release-olm-files --dev-workspace-controller-version ${DWO_VERSION} --dev-workspace-che-operator-version ${DWO_CHE_VERSION}
           else
             git checkout ${BRANCH}
             ./make-release.sh ${CHE_VERSION} --release --release-olm-files --dev-workspace-controller-version ${DWO_VERSION} --dev-workspace-che-operator-version ${DWO_CHE_VERSION}
diff --git a/make-release.sh b/make-release.sh
index 81606f735..d62936adb 100755
--- a/make-release.sh
+++ b/make-release.sh
@@ -22,6 +22,7 @@ init() {
   PUSH_GIT_CHANGES=false
   CREATE_PULL_REQUESTS=false
   RELEASE_OLM_FILES=false
+  CHECK_RESOURCES=false
   PREPARE_COMMUNITY_OPERATORS_UPDATE=false
   RELEASE_DIR=$(cd "$(dirname "$0")"; pwd)
   FORCE_UPDATE=""
@@ -38,6 +39,7 @@ init() {
       '--push-git-changes') PUSH_GIT_CHANGES=true; shift 0;;
       '--pull-requests') CREATE_PULL_REQUESTS=true; shift 0;;
       '--release-olm-files') RELEASE_OLM_FILES=true; shift 0;;
+      '--check-resources') CHECK_RESOURCES=true; shift 0;;
       '--prepare-community-operators-update') PREPARE_COMMUNITY_OPERATORS_UPDATE=true; shift 0;;
       '--dev-workspace-controller-version') DEV_WORKSPACE_CONTROLLER_VERSION=$2; shift 1;;
       '--dev-workspace-che-operator-version') DEV_WORKSPACE_CHE_OPERATOR_VERSION=$2; shift 1;;
@@ -291,6 +293,11 @@ prepareCommunityOperatorsUpdate() {
 }
 
 run() {
+  if [[ $CHECK_RESOURCES == "true" ]]; then
+    echo "[INFO] Check if resources are up to date"
+    . ${RELEASE_DIR}/.github/bin/check-resources.sh
+  fi
+
   checkoutToReleaseBranch
   updateVersionFile
   releaseOperatorCode
@@ -302,12 +309,6 @@ run() {
 init "$@"
 echo "[INFO] Release '$RELEASE' from branch '$BRANCH'"
 
-
-if [[ ${RELEASE} == *".0" ]]; then
-  echo "[INFO] Check if resources are up to date"
-  . ${RELEASE_DIR}/.github/bin/check-resources.sh
-fi
-
 if [[ $RUN_RELEASE == "true" ]]; then
   run "$@"
 fi