@@ -300,26 +300,25 @@ jobs:
300300 ruby : ${{ fromJSON(needs.ruby_versions.outputs.image_tag) }}
301301 include :
302302 # declare docker image for each platform
303- - { platform: aarch64-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base &&" }
304- - { platform: arm-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base &&" }
305- - { platform: x86-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base &&" }
306- - { platform: x86_64-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base &&" }
303+ - { runner: ubuntu-latest, platform: aarch64-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base &&" }
304+ - { runner: ubuntu-latest, platform: arm-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base &&" }
305+ - { runner: ubuntu-latest, platform: x86-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base &&" }
306+ - { runner: ubuntu-latest, platform: x86_64-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base &&" }
307307 # declare docker platform for each platform
308- - { platform: aarch64-linux-gnu, docker_platform: "--platform=linux/arm64" }
309- - { platform: aarch64-linux-musl, docker_platform: "--platform=linux/arm64" }
310- - { platform: arm-linux-gnu, docker_platform: "--platform=linux/arm/v7" }
311- - { platform: arm-linux-musl, docker_platform: "--platform=linux/arm/v7" }
312- - { platform: x86-linux-gnu, docker_platform: "--platform=linux/386" }
313- - { platform: x86-linux-musl, docker_platform: "--platform=linux/386" }
314- runs-on : ubuntu-latest
308+ - { runner: ubuntu-24.04-arm, platform: aarch64-linux-gnu, docker_platform: "--platform=linux/arm64" }
309+ - { runner: ubuntu-24.04-arm, platform: aarch64-linux-musl, docker_platform: "--platform=linux/arm64" }
310+ - { runner: ubuntu-24.04-arm, platform: arm-linux-gnu, docker_platform: "--platform=linux/arm/v7" }
311+ - { runner: ubuntu-24.04-arm, platform: arm-linux-musl, docker_platform: "--platform=linux/arm/v7" }
312+ - { runner: ubuntu-latest, platform: x86-linux-gnu, docker_platform: "--platform=linux/386" }
313+ - { runner: ubuntu-latest, platform: x86-linux-musl, docker_platform: "--platform=linux/386" }
314+ runs-on : ${{ matrix.runner || ' ubuntu-latest' }}
315315 steps :
316316 - uses : actions/checkout@v6
317317 - uses : actions/download-artifact@v6
318318 with :
319319 name : cruby-${{ matrix.platform }}-gem
320320 path : gems
321321 - run : |
322- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
323322 docker run --rm -v $PWD:/work -w /work \
324323 ${{ matrix.docker_platform}} ruby:${{ matrix.ruby }}${{ matrix.docker_tag }} \
325324 sh -c "
@@ -333,12 +332,12 @@ jobs:
333332 strategy :
334333 fail-fast : false
335334 matrix :
336- os : [windows-latest, macos-13 , macos-14 ]
335+ os : [windows-latest, macos-15-intel , macos-15 ]
337336 ruby : ${{ fromJSON(needs.ruby_versions.outputs.setup_ruby) }}
338337 include :
339- - os : macos-13
338+ - os : macos-15-intel
340339 platform : x86_64-darwin
341- - os : macos-14
340+ - os : macos-15
342341 platform : arm64-darwin
343342 - os : windows-latest
344343 platform : x64-mingw-ucrt
0 commit comments