aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2025-01-22 12:31:31 +0100
committerJunio C Hamano <gitster@pobox.com>2025-01-22 12:28:28 -0800
commit4b5073c64b6e4180dcf1bed09c6fdd52cd1b2d21 (patch)
tree94faea58db4624cc288d86f18f7e9f7b6907039b
parentci: merge linux-gcc-default into linux-gcc (diff)
downloadgit-4b5073c64b6e4180dcf1bed09c6fdd52cd1b2d21.tar.gz
git-4b5073c64b6e4180dcf1bed09c6fdd52cd1b2d21.zip
ci: repurpose "linux-gcc" job for deprecations
The "linux-gcc" job isn't all that interesting by itself and can be considered more or less the "standard" job: it is running with a reasonably up-to-date image and uses GCC as a compiler, both of which we already cover in other jobs. There is one exception though: we change the default branch to be "main" instead of "master", so it is forging ahead a bit into the future to make sure that this change does not cause havoc. So let's expand on this a bit and also add the new "WITH_BREAKING_CHANGES" flag to the mix. Rename the job to "linux-breaking-changes" accordingly. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--.github/workflows/main.yml2
-rw-r--r--.gitlab-ci.yml2
-rwxr-xr-xci/run-build-and-tests.sh3
3 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 32d35d2257..46b96fb96c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -269,7 +269,7 @@ jobs:
- jobname: linux-reftable
cc: clang
pool: ubuntu-latest
- - jobname: linux-gcc
+ - jobname: linux-breaking-changes
cc: gcc
pool: ubuntu-20.04
- jobname: linux-TEST-vars
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b86bb0bdb3..492e5d9082 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,7 @@ test:linux:
- jobname: linux-reftable
image: ubuntu:latest
CC: clang
- - jobname: linux-gcc
+ - jobname: linux-breaking-changes
image: ubuntu:20.04
CC: gcc
- jobname: linux-TEST-vars
diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index 2e28d02b20..2ccd812fb4 100755
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -13,8 +13,9 @@ esac
run_tests=t
case "$jobname" in
-linux-gcc)
+linux-breaking-changes)
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export WITH_BREAKING_CHANGES=YesPlease
;;
linux-TEST-vars)
export GIT_TEST_SPLIT_INDEX=yes