Re: [PATCH 1/6] ci: remove GETTEXT_POISON jobs
From: SZEDER Gábor <hidden>
Date: 2021-01-12 08:51:36
On Mon, Jan 11, 2021 at 03:47:35PM +0100, Ævar Arnfjörð Bjarmason wrote:
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.
I don't understand what you mean here with a "default job" that the CI is implicitly depending on. There is certainly no such default job on Travis CI, and I don't think there is one on the GitHub thing.
quoted hunk ↗ jump to hunk
Let's instead add a "default" job. 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 <redacted> --- .github/workflows/main.yml | 2 +- .travis.yml | 2 +- ci/install-dependencies.sh | 2 +- ci/lib.sh | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-)diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index aef6643648..8b52df200f 100644 --- 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 05f3e3f8d7..908330a0a3 100644 --- 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 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 ;;diff --git a/ci/lib.sh b/ci/lib.sh index 38c0eac351..d848c036c5 100755 --- 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-- 2.29.2.222.g5d2a92d10f8