diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-01-20 19:27:57 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-01-21 15:50:00 -0800 |
commit | 6c280b41421db1cf1849c737e60a0d8aa4435d41 (patch) | |
tree | 0eba86da2361b3149f65c51e346f334d6d20d651 /ci/install-dependencies.sh | |
parent | 72c4083ddf91b489b7b7b812df67ee8842177d98 (diff) | |
download | git-6c280b41421db1cf1849c737e60a0d8aa4435d41.tar.gz |
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>
Diffstat (limited to 'ci/install-dependencies.sh')
-rwxr-xr-x | ci/install-dependencies.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 0229a77f7d..79c0633a18 100755 --- 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 ;; |