Refactor an "if" statement for "linux-gcc" to a "case" statement in preparation for another case being added to it, and do the same for the "osx-gcc" just below it for consistency. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> --- ci/lib.sh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/ci/lib.sh b/ci/lib.sh index 476c3f369f5..33b9777ab7e 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -184,13 +184,15 @@ export SKIP_DASHED_BUILT_INS=YesPlease case "$jobname" in linux-clang|linux-gcc) - if [ "$jobname" = linux-gcc ] - then + case "$jobname" in + linux-gcc) export CC=gcc-8 MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python3" - else + ;; + *) MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python2" - fi + ;; + esac export GIT_TEST_HTTPD=true @@ -207,13 +209,15 @@ linux-clang|linux-gcc) export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH" ;; osx-clang|osx-gcc) - if [ "$jobname" = osx-gcc ] - then + case "$jobname" in + osx-gcc) export CC=gcc-9 MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)" - else + ;; + *) MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)" - fi + ;; + esac # t9810 occasionally fails on Travis CI OS X # t9816 occasionally fails with "TAP out of sequence errors" on -- 2.33.0.805.g739b16c2189
