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 <emil.l.velikov@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/172
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>

diff --git a/.github/actions/setup-archlinux/action.yml b/.github/actions/setup-archlinux/action.yml
index 968a88084e3b0e629593e3e28c4abf510f243109..95752089820fce870ba0f528e98ec3597439f2d8 100644 (file)
--- 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 8cfae7544c7bbbe01e00848000f4337d1235989b..7f237715c6d1630f4e7d5e82e45ab366d8ebff2d 100644 (file)
--- 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'