From: Johannes Schindelin <[email protected]> When building a PR, TRAVIS_BRANCH refers to the *target branch*. Therefore, if a PR targets `master`, and `master` happened to be tagged, we skipped the build by mistake.
Fix this by using TRAVIS_PULL_REQUEST_BRANCH (i.e. the *source branch*) when available, falling back to TRAVIS_BRANCH (i.e. for CI builds, also known as "push builds"). Signed-off-by: Johannes Schindelin <[email protected]> --- ci/lib-travisci.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci/lib-travisci.sh b/ci/lib-travisci.sh index 69dff4d1ec..d9d4f1a9d7 100755 --- a/ci/lib-travisci.sh +++ b/ci/lib-travisci.sh @@ -1,5 +1,9 @@ # Library of functions shared by all CI scripts +# When building a PR, TRAVIS_BRANCH refers to the *target* branch. Not what we +# want here. We want the source branch instead. +TRAVIS_BRANCH="${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}" + skip_branch_tip_with_tag () { # Sometimes, a branch is pushed at the same time the tag that points # at the same commit as the tip of the branch is pushed, and building -- gitgitgadget
