From f3ecfb5c2db4c31cee121933055a130e41209b7c Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Mon, 13 Jul 2020 22:23:46 +0100 Subject: [PATCH] fix s3 and diff branch --- scripts/ci/job_hooks/before_install.sh | 4 ++-- scripts/git-util/check-branch-updated.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ci/job_hooks/before_install.sh b/scripts/ci/job_hooks/before_install.sh index 816a15e76a..655ef992ee 100755 --- a/scripts/ci/job_hooks/before_install.sh +++ b/scripts/ci/job_hooks/before_install.sh @@ -5,8 +5,8 @@ pip install --user awscli export NODE_OPTIONS="--max_old_space_size=30000" export GIT_HASH=`git rev-parse HEAD` echo "GIT_HASH: $GIT_HASH" -S3_DBP_PATH="s3://alfresco-travis-builds/dbp" -export BASE_HASH="$(git describe --tags `git rev-list --tags --max-count=1`)" +S3_DBP_PATH="s3://alfresco-travis-builds/adf" +export BASE_HASH="$(git merge-base origin/$BRANCH_NAME HEAD)" export HEAD_HASH="HEAD" if [ "${TRAVIS_EVENT_TYPE}" == "push" ]; then diff --git a/scripts/git-util/check-branch-updated.sh b/scripts/git-util/check-branch-updated.sh index 527ec70719..0838579d61 100755 --- a/scripts/git-util/check-branch-updated.sh +++ b/scripts/git-util/check-branch-updated.sh @@ -29,5 +29,5 @@ hash1=$(git show-ref --heads -s develop) hash2=$(git merge-base develop $BRANCH_NAME) [ "${hash1}" = "${hash2}" ] && echo "Branch up to date" || { echo "Branch needs to be rebeased"; exit 1; } -echo "Development branch HEAD sha " $hash1 +echo "Develop branch HEAD sha " $hash1 echo "$BRANCH_NAME branch HEAD sha " $hash2