Skip to content

Commit fbc27b5

Browse files
committed
Install 64-bit libstdc++ in both 32-bit containers
This is needed so script steps can run Node.js, which is the 64-bit Node.js on the host. This appears not just to still be the case for x86, but also for ARM when using containers on the new ARM runners.
1 parent cbe3793 commit fbc27b5

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

.github/workflows/ci.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,11 @@ jobs:
204204
container-arch: [ i386, arm32v7 ]
205205
include:
206206
- container-arch: i386
207+
runner-arch: amd64
207208
runner-os: ubuntu-latest
208209
toolchain: stable-i686-unknown-linux-gnu
209210
- container-arch: arm32v7
211+
runner-arch: arm64
210212
runner-os: ubuntu-24.04-arm
211213
toolchain: stable-armv7-unknown-linux-gnueabihf
212214
fail-fast: false # FIXME: Probably remove this.
@@ -226,10 +228,10 @@ jobs:
226228
git
227229
jq
228230
libssl-dev
229-
# libstdc++6:amd64 # To support external 64-bit Node.js for actions.
231+
libstdc++6:${{ matrix.runner-arch }} # To support external 64-bit Node.js for actions.
230232
pkgconf
231233
)
232-
# dpkg --add-architecture amd64
234+
dpkg --add-architecture ${{ matrix.runner-arch }}
233235
apt-get update
234236
apt-get install --no-install-recommends -y -- "${prerequisites[@]}"
235237
shell: bash

0 commit comments

Comments
 (0)