seg_yinzy
/
che-operator
mirror of https://github.com/eclipse-che/che-operator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix release script to check resources only once (#816) 

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
pull/820/head
Anatolii Bazko 2021-05-07 12:16:18 +03:00 committed by GitHub
parent fccad9f91e
commit b6d4e446f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/release.yml vendored
View File

@ -98,7 +98,7 @@ jobs:
# we usually do not update nightly files during major releases # we usually do not update nightly files during major releases
if [[ ${CHE_VERSION} == *".0" ]]; then 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 else
git checkout ${BRANCH} 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} ./make-release.sh ${CHE_VERSION} --release --release-olm-files --dev-workspace-controller-version ${DWO_VERSION} --dev-workspace-che-operator-version ${DWO_CHE_VERSION}

13
make-release.sh
View File

@ -22,6 +22,7 @@ init() {
PUSH_GIT_CHANGES=false PUSH_GIT_CHANGES=false
CREATE_PULL_REQUESTS=false CREATE_PULL_REQUESTS=false
RELEASE_OLM_FILES=false RELEASE_OLM_FILES=false
CHECK_RESOURCES=false
PREPARE_COMMUNITY_OPERATORS_UPDATE=false PREPARE_COMMUNITY_OPERATORS_UPDATE=false
RELEASE_DIR=$(cd "$(dirname "$0")"; pwd) RELEASE_DIR=$(cd "$(dirname "$0")"; pwd)
FORCE_UPDATE="" FORCE_UPDATE=""
@ -38,6 +39,7 @@ init() {
'--push-git-changes') PUSH_GIT_CHANGES=true; shift 0;; '--push-git-changes') PUSH_GIT_CHANGES=true; shift 0;;
'--pull-requests') CREATE_PULL_REQUESTS=true; shift 0;; '--pull-requests') CREATE_PULL_REQUESTS=true; shift 0;;
'--release-olm-files') RELEASE_OLM_FILES=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;; '--prepare-community-operators-update') PREPARE_COMMUNITY_OPERATORS_UPDATE=true; shift 0;;
'--dev-workspace-controller-version') DEV_WORKSPACE_CONTROLLER_VERSION=$2; shift 1;; '--dev-workspace-controller-version') DEV_WORKSPACE_CONTROLLER_VERSION=$2; shift 1;;
'--dev-workspace-che-operator-version') DEV_WORKSPACE_CHE_OPERATOR_VERSION=$2; shift 1;; '--dev-workspace-che-operator-version') DEV_WORKSPACE_CHE_OPERATOR_VERSION=$2; shift 1;;
@ -291,6 +293,11 @@ prepareCommunityOperatorsUpdate() {
} }
run() { run() {
if [[ $CHECK_RESOURCES == "true" ]]; then
echo "[INFO] Check if resources are up to date"
. ${RELEASE_DIR}/.github/bin/check-resources.sh
fi
checkoutToReleaseBranch checkoutToReleaseBranch
updateVersionFile updateVersionFile
releaseOperatorCode releaseOperatorCode
@ -302,12 +309,6 @@ run() {
init "$@" init "$@"
echo "[INFO] Release '$RELEASE' from branch '$BRANCH'" 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 if [[ $RUN_RELEASE == "true" ]]; then
run "$@" run "$@"
fi fi