inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-06-23 18:05:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix s3 and diff branch

Browse Source
This commit is contained in:
Eugenio Romano 2020-07-13 22:23:46 +01:00
parent db8981ffc4
commit f3ecfb5c2d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/ci/job_hooks/before_install.sh
View File

@ -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

2
scripts/git-util/check-branch-updated.sh
View File

@ -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