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 <[email protected]> Link: #172 Signed-off-by: Lucas De Marchi <[email protected]>
kmod-project · Oct 9, 2024 · 271a330 · 271a330
1 parent 98f38c5
commit 271a330
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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'