diff options
| author |   Sam James <sam@gentoo.org> | 2024-02-08 01:05:05 +0000 |
|---|---|---|
| committer |   John Helmert III <ajak@gentoo.org> | 2024-02-07 19:16:39 -0800 |
| commit | 4f11bfd241fc1681b7bde2aae3e05dd21a779907 (patch) | |
| tree | 05873249e10d8b47e1becfad78b2fe8548019bfe /.github | |
| parent | Revert "deploy.sh: add amd64-systemd-mergedusr, amd64-desktop-systemd, amd64-... (diff) | |
| download | docker-images-4f11bfd241fc1681b7bde2aae3e05dd21a779907.tar.gz docker-images-4f11bfd241fc1681b7bde2aae3e05dd21a779907.tar.bz2 docker-images-4f11bfd241fc1681b7bde2aae3e05dd21a779907.zip | |
Switch systemd images to mergedusr
In bug #917143, we stopped building non-merged-usr stage3s following the
2022-12-01-systemd-usrmerge news item a while prior, as upstream systemd
no longer support non-merged-usr.
The stages for systemd w/ non-merged-usr are no being built, so the last one
we picked up was stage3-amd64-systemd-20231210T170356Z.tar.xz (and so on).
Switch all systemd images accordingly to merged-usr.
Bug: https://bugs.gentoo.org/915958
Bug: https://bugs.gentoo.org/917143
Closes: https://github.com/gentoo/gentoo-docker-images/issues/136
Signed-off-by: Sam James <sam@gentoo.org>
Signed-off-by: John Helmert III <ajak@gentoo.org>
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build.yml | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a22ace1..c2bc5dd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,43 +21,41 @@ jobs: - stage3-amd64-musl - stage3-amd64-musl-hardened - stage3-amd64-nomultilib-openrc - - stage3-amd64-nomultilib-systemd + - stage3-amd64-nomultilib-systemd-mergedusr - stage3-amd64-openrc - stage3-amd64-desktop-openrc - - stage3-amd64-systemd - stage3-amd64-systemd-mergedusr - - stage3-amd64-desktop-systemd - stage3-amd64-desktop-systemd-mergedusr - stage3-armv5tel-openrc - - stage3-armv5tel-systemd + - stage3-armv5tel-systemd-mergedusr - stage3-armv6j-openrc - - stage3-armv6j-systemd + - stage3-armv6j-systemd-mergedusr - stage3-armv6j_hardfp-openrc - - stage3-armv6j_hardfp-systemd + - stage3-armv6j_hardfp-systemd-mergedusr - stage3-armv7a-openrc - - stage3-armv7a-systemd + - stage3-armv7a-systemd-mergedusr - stage3-armv7a_hardfp_musl-openrc - stage3-armv7a_hardfp-openrc - - stage3-armv7a_hardfp-systemd + - stage3-armv7a_hardfp-systemd-mergedusr - stage3-arm64-desktop-openrc - - stage3-arm64-desktop-systemd + - stage3-arm64-desktop-systemd-mergedusr - stage3-arm64-musl - stage3-arm64-musl-hardened - stage3-arm64-openrc - - stage3-arm64-systemd + - stage3-arm64-systemd-mergedusr - stage3-i686-hardened-openrc - stage3-i686-musl - stage3-i686-openrc - - stage3-i686-systemd + - stage3-i686-systemd-mergedusr - stage3-ppc64le-musl-hardened-openrc - stage3-ppc64le-openrc - - stage3-ppc64le-systemd + - stage3-ppc64le-systemd-mergedusr - stage3-rv64_lp64-openrc - - stage3-rv64_lp64-systemd + - stage3-rv64_lp64-systemd-mergedusr - stage3-rv64_lp64d-openrc - - stage3-rv64_lp64d-systemd + - stage3-rv64_lp64d-systemd-mergedusr - stage3-s390x-openrc - - stage3-s390x-systemd + - stage3-s390x-systemd-mergedusr name: ${{ matrix.target }} runs-on: ubuntu-latest steps: |