travis: fix skipping tagged releases

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").

Let's give it a new variable name, too: CI_BRANCH (as it is different
from TRAVIS_BRANCH). This also prepares for the upcoming patches which
will make our ci/* code a bit more independent from Travis and open it
to other CI systems (in particular to Azure Pipelines).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/ci/lib-travisci.sh b/ci/lib-travisci.sh
index 69dff4d1ecb4b21c32f8127d78a87a925e9390c5..9c6ddeb374b6adead28ca92d3fac5acee233e448 100755 (executable)
--- a/ci/lib-travisci.sh
+++ b/ci/lib-travisci.sh
@@ -5,18 +5,17 @@ skip_branch_tip_with_tag () {
        # at the same commit as the tip of the branch is pushed, and building
        # both at the same time is a waste.
        #
        # at the same commit as the tip of the branch is pushed, and building
        # both at the same time is a waste.
        #

-       # Travis gives a tagname e.g. v2.14.0 in $TRAVIS_BRANCH when
-       # the build is triggered by a push to a tag.  Let's see if
-       # $TRAVIS_BRANCH is exactly at a tag, and if so, if it is
-       # different from $TRAVIS_BRANCH.  That way, we can tell if
-       # we are building the tip of a branch that is tagged and
-       # we can skip the build because we won't be skipping a build
-       # of a tag.
-
-       if TAG=$(git describe --exact-match "$TRAVIS_BRANCH" 2>/dev/null) &&
-               test "$TAG" != "$TRAVIS_BRANCH"
+       # When the build is triggered by a push to a tag, $CI_BRANCH will
+       # have that tagname, e.g. v2.14.0.  Let's see if $CI_BRANCH is
+       # exactly at a tag, and if so, if it is different from $CI_BRANCH.
+       # That way, we can tell if we are building the tip of a branch that
+       # is tagged and we can skip the build because we won't be skipping a
+       # build of a tag.
+
+       if TAG=$(git describe --exact-match "$CI_BRANCH" 2>/dev/null) &&
+               test "$TAG" != "$CI_BRANCH"

        then
        then

-               echo "$(tput setaf 2)Tip of $TRAVIS_BRANCH is exactly at $TAG$(tput sgr0)"
+               echo "$(tput setaf 2)Tip of $CI_BRANCH is exactly at $TAG$(tput sgr0)"

                exit 0
        fi
 }
                exit 0
        fi
 }


@@ -81,6 +80,10 @@ check_unignored_build_artifacts ()
 # and installing dependencies.
 set -ex
 
 # and installing dependencies.
 set -ex
 

+# When building a PR, TRAVIS_BRANCH refers to the *target* branch. Not what we
+# want here. We want the source branch instead.
+CI_BRANCH="${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}"
+

 cache_dir="$HOME/travis-cache"
 good_trees_file="$cache_dir/good-trees"
 
 cache_dir="$HOME/travis-cache"
 good_trees_file="$cache_dir/good-trees"