ci: merge linux-gcc-default into linux-gcc

The "linux-gcc-default" job is mostly doing the same as the "linux-gcc" job, except for a couple of minor differences: - We use an explicit GCC version instead of the default version provided by the distribution. We have other jobs that test with "gcc-8", making this distinction pointless. - We don't set up the Python version explicitly, and instead use the default Python version. Python 2 has been end-of-life for quite a while now though, making this distinction less interesting. - We set up the default branch name to be "main" in "linux-gcc". We have other testcases that don't and also some that explicitly use "master". - We use "ubuntu:20.04" in one job and "ubuntu:latest" in another. We already have a couple other jobs testing these respectively. So overall, the job does not add much to our test coverage. Drop the "linux-gcc-default" job and adapt "linux-gcc" to start using the default GCC compiler, effectively merging those two jobs into one. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Patrick Steinhardt committed Jan 22, 2025 at 12:31 UTC 04c29bdea04e5af5193fd386b62a48c320351f19
3 files changed -13
.github/workflows/main.yml
-4
@@ -271,7 +271,6 @@ jobs:
271 pool: ubuntu-latest
272 - jobname: linux-gcc
273 cc: gcc
274 - cc_package: gcc-8
274 pool: ubuntu-20.04
275 - jobname: linux-TEST-vars
276 cc: gcc
@@ -286,9 +285,6 @@ jobs:
285 - jobname: osx-gcc
286 cc: gcc-13
287 pool: macos-13
289 - - jobname: linux-gcc-default
290 - cc: gcc
291 - pool: ubuntu-latest
288 - jobname: linux-leaks
289 cc: gcc
290 pool: ubuntu-latest
.gitlab-ci.yml
-4
@@ -46,14 +46,10 @@ test:linux:
46 - jobname: linux-gcc
47 image: ubuntu:20.04
48 CC: gcc
49 - CC_PACKAGE: gcc-8
49 - jobname: linux-TEST-vars
50 image: ubuntu:20.04
51 CC: gcc
52 CC_PACKAGE: gcc-8
54 - - jobname: linux-gcc-default
55 - image: ubuntu:latest
56 - CC: gcc
53 - jobname: linux-leaks
54 image: ubuntu:latest
55 CC: gcc
ci/lib.sh
-5
@@ -328,11 +328,6 @@ export SKIP_DASHED_BUILT_INS=YesPlease
328
329 case "$distro" in
330 ubuntu-*)
331 - if test "$jobname" = "linux-gcc-default"
332 - then
333 - break
334 - fi
335 -
331 # Python 2 is end of life, and Ubuntu 23.04 and newer don't actually
332 # have it anymore. We thus only test with Python 2 on older LTS
333 # releases.