mirror of
https://github.com/git/git.git
synced 2026-06-24 08:48:31 +00:00
ci: unify Linux images across GitLab and GitHub
The image for the "linux-breaking-changes" job has drifted apart across GitHub and GitLab. Adapt it to use "ubuntu:rolling" on both systems. With this change there's only one difference remaining: GitHub uses "ubuntu:focal" for the "linux32" job while GitLab uses "ubuntu:20.04". These are different names for the same image, so there is no actual difference here. Adjust GitHub to use the "20.04" tag -- this matches all the other jobs which use version numbers, and you don't have to learn Ubuntu's release names by heart. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
f0ba41bae8
commit
43a6a005c8
2
.github/workflows/main.yml
vendored
2
.github/workflows/main.yml
vendored
@@ -407,7 +407,7 @@ jobs:
|
|||||||
image: alpine:latest
|
image: alpine:latest
|
||||||
# Supported until 2025-04-02.
|
# Supported until 2025-04-02.
|
||||||
- jobname: linux32
|
- jobname: linux32
|
||||||
image: i386/ubuntu:focal
|
image: i386/ubuntu:20.04
|
||||||
# A RHEL 8 compatible distro. Supported until 2029-05-31.
|
# A RHEL 8 compatible distro. Supported until 2029-05-31.
|
||||||
- jobname: almalinux-8
|
- jobname: almalinux-8
|
||||||
image: almalinux:8
|
image: almalinux:8
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ test:linux:
|
|||||||
CC: gcc
|
CC: gcc
|
||||||
CC_PACKAGE: gcc-8
|
CC_PACKAGE: gcc-8
|
||||||
- jobname: linux-breaking-changes
|
- jobname: linux-breaking-changes
|
||||||
image: ubuntu:20.04
|
image: ubuntu:rolling
|
||||||
CC: gcc
|
CC: gcc
|
||||||
- jobname: fedora-breaking-changes-meson
|
- jobname: fedora-breaking-changes-meson
|
||||||
image: fedora:latest
|
image: fedora:latest
|
||||||
|
|||||||
Reference in New Issue
Block a user