Skip to content

Commit 3a952e5

Browse files
committed
let's see if we can just use the qemu-user stuff...
1 parent 2b3346f commit 3a952e5

File tree

1 file changed

+21
-2
lines changed

1 file changed

+21
-2
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ jobs:
3131
os: ubuntu-24.04-arm
3232
multiarch: armhf
3333
gcc_cross: arm-linux-gnueabihf
34+
- host_target: s390x-unknown-linux-gnu
35+
os: ubuntu-latest
36+
multiarch: s390x
37+
gcc_cross: s390x-linux-gnu
38+
qemu: true
3439
- host_target: aarch64-apple-darwin
3540
os: macos-latest
3641
- host_target: i686-pc-windows-msvc
@@ -40,9 +45,23 @@ jobs:
4045
HOST_TARGET: ${{ matrix.host_target }}
4146
steps:
4247
- uses: actions/checkout@v4
43-
- name: multiarch setup
48+
- name: install qemu
49+
if: ${{ matrix.qemu }}
50+
run: sudo apt install qemu-user qemu-user-binfmt
51+
- name: install multiarch
4452
if: ${{ matrix.multiarch != '' }}
4553
run: |
54+
# Some multiarch architectures seem to be missing from security.ubuntu.com... so try to disable that.
55+
echo "Sources before patch:"
56+
cat /etc/apt/sources.list.d/*
57+
echo
58+
sudo sed -i -E 's/(Suites:.*security$)/\1\nArchitectures:/' /etc/apt/sources.list.d/ubuntu.sources
59+
sudo bash -c "echo 'https://ports.ubuntu.com/ priority:4' >> /etc/apt/apt-mirrors.txt"
60+
echo "Sources after patch:"
61+
cat /etc/apt/sources.list.d/*
62+
echo
63+
cat /etc/apt/apt-mirrors.txt
64+
# Add architecture and install base packages.
4665
sudo dpkg --add-architecture ${{ matrix.multiarch }}
4766
sudo apt update
4867
sudo apt install $(echo "libatomic1: zlib1g-dev:" | sed 's/:/:${{ matrix.multiarch }}/g')
@@ -52,7 +71,7 @@ jobs:
5271

5372
# We set up the cross-compiler *after* the basic setup as setting CC would otherwise
5473
# cause confusion.
55-
- name: gcc-cross setup
74+
- name: install gcc-cross
5675
if: ${{ matrix.gcc_cross != '' }}
5776
run: |
5877
sudo apt install gcc-${{ matrix.gcc_cross }}

0 commit comments

Comments
 (0)