Skip to content

Commit

Permalink
ci: directly use archlinux:multilib-devel
Browse files Browse the repository at this point in the history
I've introduced the container an year or so ago, to avoid the manual
pacman.conf fiddle. Although the last few months it wasn't quite working
as expected due to expired publishing tokens et al.

With that fixed we can use it \o/

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
  • Loading branch information
evelikov authored and gregkh committed Oct 16, 2024
1 parent 595d378 commit 5827abb
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
8 changes: 0 additions & 8 deletions .github/actions/setup-archlinux/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,15 @@ 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.
rm -rf /etc/pacman.d/gnupg
pacman-key --init
pacman-key --populate
pacman --noconfirm -Sy archlinux-keyring
pacman --noconfirm -Su \
base-devel \
git \
lib32-libusb \
lib32-systemd \
libusb \
linux-headers \
multilib-devel \
meson \
systemd
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
matrix:
include:
- container: 'alpine:latest'
- container: 'archlinux:base-devel'
- container: 'archlinux:multilib-devel'
crossfile: 'arch-cross.ini'
- container: 'debian:unstable'
crossfile: 'debian-cross.ini'
Expand Down

0 comments on commit 5827abb

Please sign in to comment.