From 5d96134ed3d432c35904628e772271948030f537 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 26 Nov 2019 19:32:59 +0800 Subject: [PATCH 1/3] update update_ccache.sh --- ci/scripts/update_ccache.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/scripts/update_ccache.sh b/ci/scripts/update_ccache.sh index 4f3243e6a1..17798088a3 100755 --- a/ci/scripts/update_ccache.sh +++ b/ci/scripts/update_ccache.sh @@ -54,6 +54,8 @@ fi PACKAGE_FILE="ccache-${OS_NAME}-${CODE_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz" REMOTE_PACKAGE_PATH="${ARTIFACTORY_URL}/${BRANCH_NAME}" +ccache --show-stats + echo "Updating ccache package file: ${PACKAGE_FILE}" tar zcf ./${PACKAGE_FILE} -C ${HOME}/.ccache . echo "Uploading ccache package file ${PACKAGE_FILE} to ${REMOTE_PACKAGE_PATH}" From e993bc10a70072ad40611afc59339fa59194d695 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 26 Nov 2019 21:18:37 +0800 Subject: [PATCH 2/3] update check_ccache.sh --- ci/scripts/check_ccache.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ci/scripts/check_ccache.sh b/ci/scripts/check_ccache.sh index 7e7b79f542..66c2788c71 100755 --- a/ci/scripts/check_ccache.sh +++ b/ci/scripts/check_ccache.sh @@ -57,5 +57,20 @@ do fi done +if [[ ${BRANCH_NAME} =~ "PR-" && ! -n ${CHANGE_BRANCH} ]];then + echo "fetching ${CHANGE_BRANCH}/ccache-${OS_NAME}-${CODE_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz" + wget -q --method HEAD "${ARTIFACTORY_URL}/${CHANGE_BRANCH}/ccache-${OS_NAME}-${CODE_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz" + if [[ $? == 0 ]];then + wget "${ARTIFACTORY_URL}/${CHANGE_BRANCH}/ccache-${OS_NAME}-${CODE_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz" && \ + mkdir -p ${CCACHE_DIRECTORY} && \ + tar zxf ccache-${OS_NAME}-${CODE_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz -C ${CCACHE_DIRECTORY} && \ + rm ccache-${OS_NAME}-${CODE_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz + if [[ $? == 0 ]];then + echo "found cache" + exit 0 + fi + fi +fi + echo "could not download cache" && exit 1 From 3abc7d3e0df68002e45e6b15262e48ed16f68089 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 26 Nov 2019 21:50:39 +0800 Subject: [PATCH 3/3] update check_ccache.sh --- ci/scripts/check_ccache.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/scripts/check_ccache.sh b/ci/scripts/check_ccache.sh index 66c2788c71..9477433876 100755 --- a/ci/scripts/check_ccache.sh +++ b/ci/scripts/check_ccache.sh @@ -57,7 +57,7 @@ do fi done -if [[ ${BRANCH_NAME} =~ "PR-" && ! -n ${CHANGE_BRANCH} ]];then +if [[ -n "${CHANGE_BRANCH}" && "${BRANCH_NAME}" =~ "PR-" ]];then echo "fetching ${CHANGE_BRANCH}/ccache-${OS_NAME}-${CODE_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz" wget -q --method HEAD "${ARTIFACTORY_URL}/${CHANGE_BRANCH}/ccache-${OS_NAME}-${CODE_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz" if [[ $? == 0 ]];then