From 1aedfec8e972f940d62c69afdff18cadb8c8fc08 Mon Sep 17 00:00:00 2001 From: commitay Date: Wed, 27 Sep 2017 12:55:01 +1000 Subject: [PATCH] before_script.sh: update to match main repo --- ci/travis/before_script.sh | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/ci/travis/before_script.sh b/ci/travis/before_script.sh index cf2d25843..1b313f19e 100755 --- a/ci/travis/before_script.sh +++ b/ci/travis/before_script.sh @@ -10,17 +10,6 @@ header 'Running before_script.sh...' -# 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 -if ! run 'MERGE_BASE="$(git merge-base "${BRANCH_COMMIT}" "${TARGET_COMMIT}")"'; then - run git fetch --unshallow - run 'MERGE_BASE="$(git merge-base "${BRANCH_COMMIT}" "${TARGET_COMMIT}")"' -fi -run export MERGE_BASE="${MERGE_BASE}" -run export TRAVIS_COMMIT_RANGE="${MERGE_BASE}...${BRANCH_COMMIT}" - # make sure brew is on master branch run export HOMEBREW_DEVELOPER=1