Skip to content

Commit

Permalink
ci: remove GETTEXT_POISON jobs
Browse files Browse the repository at this point in the history
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 <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
avar authored and gitster committed Jan 21, 2021
1 parent 72c4083 commit 6c280b4
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ compiler:

matrix:
include:
- env: jobname=GETTEXT_POISON
- env: jobname=linux-gcc-default
os: linux
compiler:
addons:
Expand Down
2 changes: 1 addition & 1 deletion ci/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
;;
Expand Down
3 changes: 1 addition & 2 deletions ci/lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6c280b4

Please sign in to comment.