From 61b0427d477de03562288a1862350a22b9ad968b Mon Sep 17 00:00:00 2001 From: Jo Zzsi Date: Tue, 12 Nov 2024 07:08:12 -0500 Subject: [PATCH] ci: switch from musl:openrc to glibc:openrc The goal is to test some common non-systemd configuration. glibc:openrc is probably a better option for this goal, and GitHub Action (node) fails to run tests on the Gentoo based musl container. --- .github/workflows/container-extra.yml | 2 +- .github/workflows/integration-extra.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/container-extra.yml b/.github/workflows/container-extra.yml index ef2e44f39..589c68b40 100644 --- a/.github/workflows/container-extra.yml +++ b/.github/workflows/container-extra.yml @@ -37,7 +37,7 @@ jobs: - { dockerfile: 'Dockerfile-ubuntu', tag: 'ubuntu:rolling', platform: 'linux/amd64' } - { dockerfile: 'Dockerfile-alpine', tag: 'alpine:edge', platform: 'linux/amd64' } - { dockerfile: 'Dockerfile-gentoo', tag: 'gentoo:latest', platform: 'linux/amd64', option: 'systemd' } - - { dockerfile: 'Dockerfile-gentoo', tag: 'gentoo:musl', platform: 'linux/amd64', option: 'musl' } + - { dockerfile: 'Dockerfile-gentoo', tag: 'gentoo:amd64-openrc', platform: 'linux/amd64', option: 'amd64-openrc' } - { dockerfile: 'Dockerfile-fedora', tag: 'fedora:rawhide', platform: 'linux/amd64', registry: 'registry.fedoraproject.org' } - { dockerfile: 'Dockerfile-fedora', tag: 'centos:stream10-development', platform: 'linux/amd64', registry: 'quay.io/centos' } steps: diff --git a/.github/workflows/integration-extra.yml b/.github/workflows/integration-extra.yml index e05b55d44..c4cd49ea6 100644 --- a/.github/workflows/integration-extra.yml +++ b/.github/workflows/integration-extra.yml @@ -33,7 +33,7 @@ jobs: "fedora:rawhide", "centos:stream10-development", "gentoo", - "gentoo:musl" + "gentoo:amd64-openrc", "opensuse", "ubuntu", "ubuntu:rolling",