dnrops
/
homebrew-cask
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly set TRAVIS_COMMIT_RANGE using git merge-base

This commit is contained in:
Josh Hagins 2016-01-07 03:52:43 -05:00
parent d03dcfd322
commit a76c4cd568
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ci/travis/before_install.sh
View File

@ -15,14 +15,17 @@ header 'Running before_install.sh...'
# unset rvm hook functions
run unset -f cd gem
# see https://github.com/travis-ci/travis-ci/issues/2666
# shellcheck disable=SC2016
run 'TRAVIS_COMMIT="$(git rev-parse --verify -q HEAD)"'
run export TRAVIS_COMMIT="${TRAVIS_COMMIT}"
# print all travis-defined environment variables
run 'env | sort'
# see https://github.com/travis-ci/travis-ci/issues/2666
run export BRANCH_COMMIT="${TRAVIS_COMMIT_RANGE##*.}"
run export TARGET_COMMIT="${TRAVIS_COMMIT_RANGE%%.*}"
# shellcheck disable=SC2016
run 'MERGE_BASE="$(git merge-base "${BRANCH_COMMIT}" "${TARGET_COMMIT}")"'
run export MERGE_BASE="${MERGE_BASE}"
run export TRAVIS_COMMIT_RANGE="${MERGE_BASE}...${BRANCH_COMMIT}"
# print detailed OSX version info
run sw_vers

8
ci/travis/script.sh
View File

@ -12,14 +12,6 @@ enter_build_step
header 'Running script.sh...'
if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then
TRAVIS_BRANCH_COMMIT="$(git rev-parse --verify -q "${TRAVIS_BRANCH}")"
TRAVIS_COMMIT_RANGE="${TRAVIS_BRANCH_COMMIT}..${TRAVIS_COMMIT}"
else
TRAVIS_LAST_COMMIT="$(git rev-parse --verify -q "${TRAVIS_COMMIT}^")"
TRAVIS_COMMIT_RANGE="${TRAVIS_LAST_COMMIT}..${TRAVIS_COMMIT}"
fi
# audit any modified casks (download if version, sha256, or url changed)
run developer/bin/audit_modified_casks "${TRAVIS_COMMIT_RANGE}"