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
334afbc76f (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>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2021-01-20 19:27:57 +01:00 committed by Junio C Hamano
parent 72c4083ddf
commit 6c280b4142
4 changed files with 4 additions and 5 deletions

View File

@ -286,7 +286,7 @@ jobs:
- jobname: osx-gcc - jobname: osx-gcc
cc: gcc cc: gcc
pool: macos-latest pool: macos-latest
- jobname: GETTEXT_POISON - jobname: linux-gcc-default
cc: gcc cc: gcc
pool: ubuntu-latest pool: ubuntu-latest
env: env:

View File

@ -16,7 +16,7 @@ compiler:
matrix: matrix:
include: include:
- env: jobname=GETTEXT_POISON - env: jobname=linux-gcc-default
os: linux os: linux
compiler: compiler:
addons: addons:

View File

@ -72,7 +72,7 @@ Documentation)
test -n "$ALREADY_HAVE_ASCIIDOCTOR" || test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
sudo gem install --version 1.5.8 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 update
sudo apt-get -q -y install $UBUNTU_COMMON_PKGS sudo apt-get -q -y install $UBUNTU_COMMON_PKGS
;; ;;

View File

@ -220,8 +220,7 @@ osx-clang|osx-gcc)
# Travis CI OS X # Travis CI OS X
export GIT_SKIP_TESTS="t9810 t9816" export GIT_SKIP_TESTS="t9810 t9816"
;; ;;
GETTEXT_POISON) linux-gcc-default)
export GIT_TEST_GETTEXT_POISON=true
;; ;;
Linux32) Linux32)
CC=gcc CC=gcc