ci: remove GETTEXT_POISON jobs

A subsequent commit will remove GETTEXT_POISON entirely, let's start by removing the CI jobs that enable the option. We cannot just remove the job because the CI is implicitly depending on the "poison" job being a sort of "default" job in the sense that it's the job that was otherwise run with the default compiler, no other GIT_TEST_* options etc. So let's keep it under the name "linux-gcc-default". This means we can remove the initial "make test" from the "linux-gcc" job (it does another one after setting a bunch of GIT_TEST_* variables). I'm not doing that because it would conflict with the in-flight 334afbc76fb (tests: mark tests relying on the current default for `init.defaultBranch`, 2020-11-18) (currently on the "seen" branch, so the SHA-1 will almost definitely change). It's going to use that "make test" again for different reasons, so let's preserve it for now. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Jan 20, 2021 at 19:27 UTC 6c280b41421db1cf1849c737e60a0d8aa4435d41
4 files changed +4 -5
.github/workflows/main.yml
+1 -1
@@ -286,7 +286,7 @@ jobs:
286 - jobname: osx-gcc
287 cc: gcc
288 pool: macos-latest
289 - - jobname: GETTEXT_POISON
289 + - jobname: linux-gcc-default
290 cc: gcc
291 pool: ubuntu-latest
292 env:
.travis.yml
+1 -1
@@ -16,7 +16,7 @@ compiler:
16
17 matrix:
18 include:
19 - - env: jobname=GETTEXT_POISON
19 + - env: jobname=linux-gcc-default
20 os: linux
21 compiler:
22 addons:
ci/install-dependencies.sh
+1 -1
@@ -72,7 +72,7 @@ Documentation)
72 test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
73 sudo gem install --version 1.5.8 asciidoctor
74 ;;
75 -linux-gcc-4.8|GETTEXT_POISON)
75 +linux-gcc-default|linux-gcc-4.8)
76 sudo apt-get -q update
77 sudo apt-get -q -y install $UBUNTU_COMMON_PKGS
78 ;;
ci/lib.sh
+1 -2
@@ -220,8 +220,7 @@ osx-clang|osx-gcc)
220 # Travis CI OS X
221 export GIT_SKIP_TESTS="t9810 t9816"
222 ;;
223 -GETTEXT_POISON)
224 - export GIT_TEST_GETTEXT_POISON=true
223 +linux-gcc-default)
224 ;;
225 Linux32)
226 CC=gcc