Skip to content

Commit 6c280b4

Browse files
avargitster
authored andcommitted
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 334afbc (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 72c4083 commit 6c280b4

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ jobs:
286286
- jobname: osx-gcc
287287
cc: gcc
288288
pool: macos-latest
289-
- jobname: GETTEXT_POISON
289+
- jobname: linux-gcc-default
290290
cc: gcc
291291
pool: ubuntu-latest
292292
env:

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ compiler:
1616

1717
matrix:
1818
include:
19-
- env: jobname=GETTEXT_POISON
19+
- env: jobname=linux-gcc-default
2020
os: linux
2121
compiler:
2222
addons:

ci/install-dependencies.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Documentation)
7272
test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
7373
sudo gem install --version 1.5.8 asciidoctor
7474
;;
75-
linux-gcc-4.8|GETTEXT_POISON)
75+
linux-gcc-default|linux-gcc-4.8)
7676
sudo apt-get -q update
7777
sudo apt-get -q -y install $UBUNTU_COMMON_PKGS
7878
;;

ci/lib.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,7 @@ osx-clang|osx-gcc)
220220
# Travis CI OS X
221221
export GIT_SKIP_TESTS="t9810 t9816"
222222
;;
223-
GETTEXT_POISON)
224-
export GIT_TEST_GETTEXT_POISON=true
223+
linux-gcc-default)
225224
;;
226225
Linux32)
227226
CC=gcc

0 commit comments

Comments
 (0)