From: Emil Velikov Date: Thu, 3 Oct 2024 16:02:45 +0000 (+0100) Subject: ci: directly use archlinux:multilib-devel container X-Git-Tag: v34~255 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=271a330fb623757492ab156ebe4fa4a988750d34;p=thirdparty%2Fkmod.git ci: directly use archlinux:multilib-devel container There was some recent snafu which meant the container wasn't available. With that resolved, we can drop our hack and use the correct container directly. Signed-off-by: Emil Velikov Link: https://github.com/kmod-project/kmod/pull/172 Signed-off-by: Lucas De Marchi --- diff --git a/.github/actions/setup-archlinux/action.yml b/.github/actions/setup-archlinux/action.yml index 968a8808..95752089 100644 --- a/.github/actions/setup-archlinux/action.yml +++ b/.github/actions/setup-archlinux/action.yml @@ -11,8 +11,6 @@ runs: - name: Install dependencies shell: bash run: | - # Enable multilib, for building 32bit binaries - echo -e '[multilib]\nInclude = /etc/pacman.d/mirrorlist' >> /etc/pacman.conf # Semi-regularly the packager key may have (temporarily) expired. # Somewhat robust solution is to wipe the local keyring and # regenerate/reinstall it prior to any other packages on the system. @@ -22,7 +20,6 @@ runs: pacman --noconfirm -Sy archlinux-keyring pacman --noconfirm -Su \ - multilib-devel \ linux-headers \ meson \ rsync \ diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8cfae754..7f237715 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: - name: 'ubuntu:24.04' meson_setup: '-D b_sanitize=address,undefined' multilib: 'true' - - name: 'archlinux:base-devel' + - name: 'archlinux:multilib-devel' meson_setup: '-D b_sanitize=address,undefined' multilib: 'true' - name: 'fedora:latest'