From b6d11377a5a43954992c7fd23e0e20cb4d86f9aa Mon Sep 17 00:00:00 2001 From: quicksilver Date: Fri, 29 Nov 2019 17:05:24 +0800 Subject: [PATCH 1/2] format check_ccache.sh --- ci/scripts/check_ccache.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ci/scripts/check_ccache.sh b/ci/scripts/check_ccache.sh index 834ba5f8b0..3ca0123bbf 100755 --- a/ci/scripts/check_ccache.sh +++ b/ci/scripts/check_ccache.sh @@ -57,17 +57,17 @@ check_ccache() { fi } -for BRANCH_NAME in ${BRANCH_NAMES} -do - if [[ "${BRANCH_NAME}" != "HEAD" ]];then - check_ccache ${BRANCH_NAME} - fi -done - if [[ -n "${CHANGE_BRANCH}" && "${BRANCH_NAME}" =~ "PR-" ]];then check_ccache ${CHANGE_BRANCH} check_ccache ${BRANCH_NAME} fi +for BRANCH in ${BRANCH_NAMES} +do + if [[ "${BRANCH}" != "HEAD" ]];then + check_ccache ${BRANCH} + fi +done + echo "could not download cache" && exit 1 From a223ee313bf61d8da6dd082a6ed33302286e7645 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Fri, 29 Nov 2019 17:06:53 +0800 Subject: [PATCH 2/2] format check_ccache.sh --- ci/scripts/check_ccache.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/scripts/check_ccache.sh b/ci/scripts/check_ccache.sh index 3ca0123bbf..2350bd558d 100755 --- a/ci/scripts/check_ccache.sh +++ b/ci/scripts/check_ccache.sh @@ -62,10 +62,10 @@ if [[ -n "${CHANGE_BRANCH}" && "${BRANCH_NAME}" =~ "PR-" ]];then check_ccache ${BRANCH_NAME} fi -for BRANCH in ${BRANCH_NAMES} +for CURRENT_BRANCH in ${BRANCH_NAMES} do - if [[ "${BRANCH}" != "HEAD" ]];then - check_ccache ${BRANCH} + if [[ "${CURRENT_BRANCH}" != "HEAD" ]];then + check_ccache ${CURRENT_BRANCH} fi done