From 7d94f6a136cd799c97614b715cd99027bc36bf62 Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Fri, 24 Apr 2020 07:53:52 +0300 Subject: [PATCH] Fix release script (#226) Signed-off-by: Anatoliy Bazko --- make-release.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/make-release.sh b/make-release.sh index 659b15d4e..44cace87d 100755 --- a/make-release.sh +++ b/make-release.sh @@ -72,9 +72,6 @@ resetLocalChanges() { git fetch ${GIT_REMOTE_UPSTREAM} --prune git pull ${GIT_REMOTE_UPSTREAM} $BRANCH git checkout -B $RELEASE - - local changes=$(git status -s | wc -l) - [[ $changes -gt 0 ]] && { echo -e $RED"The number of changes are greated then 0. Check 'git status'."$NC; return 1; } elif [[ $result == 1 ]]; then echo -e $YELLOW"> SKIPPED"$NC fi @@ -155,9 +152,9 @@ releaseOperatorCode() { echo $operatorlocalyaml read -p "Press enter to continue" - echo -e $GREEN"2.6 Validate number of changed files"$NC + echo -e $GREEN"2.5 Validate number of changed files"$NC local changes=$(git status -s | wc -l) - [[ $changes -gt 1 ]] && { echo -e $RED"The number of changes are greated then 2. Check 'git status'."$NC; return 1; } + [[ $changes -gt 1 ]] && { echo -e $RED"The number of changes are greated then 2. Check 'git status'."$NC; return 1; } || true elif [[ $result == 1 ]]; then echo -e $YELLOW"> SKIPPED"$NC fi @@ -217,7 +214,7 @@ updateNightlyOlmFiles() { echo -e $GREEN"5.4 Validate number of changed files"$NC local changes=$(git status -s | wc -l) - [[ $changes -gt 4 ]] && { echo -e $RED"The number of changes are greated then 4. Check 'git status'."$NC; return 1; } + [[ $changes -gt 4 ]] && { echo -e $RED"The number of changes are greated then 4. Check 'git status'."$NC; return 1; } || true elif [[ $result == 1 ]]; then echo -e $YELLOW"> SKIPPED"$NC @@ -269,8 +266,7 @@ releaseOlmFiles() { echo -e $GREEN"7.4 Validate number of changed files"$NC local changes=$(git status -s | wc -l) - echo "Number for changes: "$changes - [[ $changes -gt 4 ]] && { echo -e $RED"The number of changes is greater then 4. Check 'git status'."$NC; return 1; } + [[ $changes -gt 4 ]] && { echo -e $RED"The number of changes is greater then 4. Check 'git status'."$NC; return 1; } || true elif [[ $result == 1 ]]; then echo -e $YELLOW"> SKIPPED"$NC fi