From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 6 Feb 2025 22:56:44 +0000 (-0800)
Subject: Merge branch 'ps/ci-misc-updates'
X-Git-Tag: v2.49.0-rc0~55
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2bf3c7fab19a59cde3a3dda9398075f0fe8d57c1;p=thirdparty%2Fgit.git

Merge branch 'ps/ci-misc-updates'

CI updates (containerization, dropping stale ones, etc.).

* ps/ci-misc-updates:
  ci: remove stale code for Azure Pipelines
  ci: use latest Ubuntu release
  ci: stop special-casing for Ubuntu 16.04
  gitlab-ci: add linux32 job testing against i386
  gitlab-ci: remove the "linux-old" job
  github: simplify computation of the job's distro
  github: convert all Linux jobs to be containerized
  github: adapt containerized jobs to be rootless
  t7422: fix flaky test caused by buffered stdout
  t0060: fix EBUSY in MinGW when setting up runtime prefix
---

2bf3c7fab19a59cde3a3dda9398075f0fe8d57c1
diff --cc .github/workflows/main.yml
index 909dd9cdbb,b90381ae01..5d76999d09
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@@ -390,9 -313,37 +365,33 @@@ jobs
        fail-fast: false
        matrix:
          vector:
+         - jobname: linux-sha256
+           image: ubuntu:rolling
+           cc: clang
+         - jobname: linux-reftable
+           image: ubuntu:rolling
+           cc: clang
 -        - jobname: linux-gcc
 -          image: ubuntu:20.04
 -          cc: gcc
 -          cc_package: gcc-8
+         - jobname: linux-TEST-vars
+           image: ubuntu:20.04
+           cc: gcc
+           cc_package: gcc-8
 -        - jobname: linux-gcc-default
 -          image: ubuntu:rolling
++        - jobname: linux-breaking-changes
+           cc: gcc
++          image: ubuntu:rolling
+         - jobname: linux-leaks
+           image: ubuntu:rolling
+           cc: gcc
+         - jobname: linux-reftable-leaks
+           image: ubuntu:rolling
+           cc: gcc
+         - jobname: linux-asan-ubsan
+           image: ubuntu:rolling
+           cc: clang
+         - jobname: linux-meson
+           image: ubuntu:rolling
+           cc: gcc
          - jobname: linux-musl
-           image: alpine
-           distro: alpine-latest
+           image: alpine:latest
          # Supported until 2025-04-02.
          - jobname: linux32
            image: i386/ubuntu:focal
diff --cc .gitlab-ci.yml
index b67a284fa9,8ed3ff5f03..be00a1572c
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -36,30 -36,31 +36,27 @@@ test:linux
        fi
    parallel:
      matrix:
-       - jobname: linux-old
-         image: ubuntu:20.04
-         CC: gcc
        - jobname: linux-sha256
-         image: ubuntu:latest
+         image: ubuntu:rolling
          CC: clang
        - jobname: linux-reftable
-         image: ubuntu:latest
+         image: ubuntu:rolling
          CC: clang
 -      - jobname: linux-gcc
 +      - jobname: linux-breaking-changes
          image: ubuntu:20.04
          CC: gcc
 -        CC_PACKAGE: gcc-8
        - jobname: linux-TEST-vars
          image: ubuntu:20.04
          CC: gcc
          CC_PACKAGE: gcc-8
 -      - jobname: linux-gcc-default
 -        image: ubuntu:rolling
 -        CC: gcc
        - jobname: linux-leaks
-         image: ubuntu:latest
+         image: ubuntu:rolling
          CC: gcc
        - jobname: linux-reftable-leaks
-         image: ubuntu:latest
+         image: ubuntu:rolling
          CC: gcc
        - jobname: linux-asan-ubsan
-         image: ubuntu:latest
+         image: ubuntu:rolling
          CC: clang
        - jobname: pedantic
          image: fedora:latest