travis-ci: introduce a $jobname variable for 'ci/*' scripts

A couple of 'ci/*' scripts are shared between different build jobs: 'ci/lib-travisci.sh', being a common library, is sourced from almost every script, while 'ci/install-dependencies.sh', 'ci/run-build.sh' and 'ci/run-tests.sh' are shared between the "regular" GCC and Clang Linux and OSX build jobs, and the latter two scripts are used in the GETTEXT_POISON Linux build job as well. Our builds could benefit from these shared scripts being able to easily tell which build job they are taking part in. Now, it's already quite easy to tell apart Linux vs OSX and GCC vs Clang build jobs, but it gets trickier with all the additional Linux-based build jobs included explicitly in the build matrix. Unfortunately, Travis CI doesn't provide much help in this regard. The closest we've got is the $TRAVIS_JOB_NUMBER variable, the value of which is two dot-separated integers, where the second integer indicates a particular build job. While it would be possible to use that second number to identify the build job in our shared scripts, it doesn't seem like a good idea to rely on that: - Though the build job numbering sequence seems to be stable so far, Travis CI's documentation doesn't explicitly states that it is indeed stable and will remain so in the future. And even if it were stable, - if we were to remove or insert a build job in the middle, then the job numbers of all subsequent build jobs would change accordingly. So roll our own means of simple build job identification and introduce the $jobname environment variable in our builds, setting it in the environments of the explicitly included jobs in '.travis.yml', while constructing one in 'ci/lib-travisci.sh' as the combination of the OS and compiler name for the GCC and Clang Linux and OSX build jobs. Use $jobname instead of $TRAVIS_OS_NAME in scripts taking different actions based on the OS and build job (when installing P4 and Git LFS dependencies and including them in $PATH). The following two patches will also rely on $jobname. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

SZEDER Gábor committed Dec 12, 2017 at 00:34 UTC bf427a94517dfcd09b564d327526b16908bcc0da
3 files changed +15 -10
.travis.yml
+5 -5
@@ -39,12 +39,12 @@ env:
39
40 matrix:
41 include:
42 - - env: GETTEXT_POISON=YesPlease
42 + - env: jobname=GETTEXT_POISON GETTEXT_POSION=YesPlease
43 os: linux
44 compiler:
45 addons:
46 before_install:
47 - - env: Windows
47 + - env: jobname=Windows
48 os: linux
49 compiler:
50 addons:
@@ -55,7 +55,7 @@ matrix:
55 test "$TRAVIS_REPO_SLUG" != "git/git" ||
56 ci/run-windows-build.sh $TRAVIS_BRANCH $(git rev-parse HEAD)
57 after_failure:
58 - - env: Linux32
58 + - env: jobname=Linux32
59 os: linux
60 compiler:
61 services:
@@ -63,7 +63,7 @@ matrix:
63 before_install:
64 before_script:
65 script: ci/run-linux32-docker.sh
66 - - env: Static Analysis
66 + - env: jobname=StaticAnalysis
67 os: linux
68 compiler:
69 addons:
@@ -74,7 +74,7 @@ matrix:
74 before_script:
75 script: ci/run-static-analysis.sh
76 after_failure:
77 - - env: Documentation
77 + - env: jobname=Documentation
78 os: linux
79 compiler:
80 addons:
ci/install-dependencies.sh
+3 -3
@@ -8,8 +8,8 @@
8 P4WHENCE=http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION
9 LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION
10
11 -case "${TRAVIS_OS_NAME:-linux}" in
12 -linux)
11 +case "$jobname" in
12 +linux-clang|linux-gcc)
13 export GIT_TEST_HTTPD=YesPlease
14
15 mkdir --parents "$P4_PATH"
@@ -26,7 +26,7 @@ linux)
26 cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs .
27 popd
28 ;;
29 -osx)
29 +osx-clang|osx-gcc)
30 brew update --quiet
31 # Uncomment this if you want to run perf tests:
32 # brew install gnu-time
ci/lib-travisci.sh
+7 -2
@@ -27,8 +27,13 @@ set -e
27
28 skip_branch_tip_with_tag
29
30 -case "${TRAVIS_OS_NAME:-linux}" in
31 -linux)
30 +if test -z "$jobname"
31 +then
32 + jobname="$TRAVIS_OS_NAME-$CC"
33 +fi
34 +
35 +case "$jobname" in
36 +linux-clang|linux-gcc)
37 P4_PATH="$(pwd)/custom/p4"
38 GIT_LFS_PATH="$(pwd)/custom/git-lfs"
39 export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH"