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>

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index aef66436484af18fb91504f8c9701de7b25e7059..8b52df200fdc896dbd2107470d826e7859d6656c 100644 (file)
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -286,7 +286,7 @@ jobs:
           - jobname: osx-gcc
             cc: gcc
             pool: macos-latest
-          - jobname: GETTEXT_POISON
+          - jobname: linux-gcc-default
             cc: gcc
             pool: ubuntu-latest
     env:

diff --git a/.travis.yml b/.travis.yml
index 05f3e3f8d79117c1d32bf5e433d0fd49de93125c..908330a0a3d5d1c1bad56544ba5bb18c3b783c84 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ compiler:
 
 matrix:
   include:
-    - env: jobname=GETTEXT_POISON
+    - env: jobname=linux-gcc-default
       os: linux
       compiler:
       addons:

diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 0229a77f7d281fa9717e359f34c634f118035a62..79c0633a18fe7fee21d53a3079c4f60465f4e99c 100755 (executable)
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -72,7 +72,7 @@ Documentation)
        test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
        sudo gem install --version 1.5.8 asciidoctor
        ;;
-linux-gcc-4.8|GETTEXT_POISON)
+linux-gcc-default|linux-gcc-4.8)
        sudo apt-get -q update
        sudo apt-get -q -y install $UBUNTU_COMMON_PKGS
        ;;

diff --git a/ci/lib.sh b/ci/lib.sh
index 38c0eac351e7156d9c72d06b7fb7a275ba15405b..d848c036c50f92725b2bfddcb8c7203a25c1819b 100755 (executable)
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -220,8 +220,7 @@ osx-clang|osx-gcc)
        # Travis CI OS X
        export GIT_SKIP_TESTS="t9810 t9816"
        ;;
-GETTEXT_POISON)
-       export GIT_TEST_GETTEXT_POISON=true
+linux-gcc-default)
        ;;
 Linux32)
        CC=gcc