From ad66b0031458917dcb16284fe33d21c6edc4f6d8 Mon Sep 17 00:00:00 2001 From: Casper Jeukendrup <48658420+cbjeukendrup@users.noreply.github.com> Date: Wed, 23 Oct 2024 15:18:58 +0200 Subject: [PATCH] Fix finding Docker image for ARM Linux builds --- .github/workflows/build_linux_arm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_linux_arm.yml b/.github/workflows/build_linux_arm.yml index 69e3419e71ea1..01b7e8f0a5323 100644 --- a/.github/workflows/build_linux_arm.yml +++ b/.github/workflows/build_linux_arm.yml @@ -173,7 +173,7 @@ jobs: run: | C_URL=${SENTRY_URL}; if [ -z "$C_URL" ]; then C_URL="''"; fi - sudo docker run -i -v "${PWD}:/MuseScore" -v /usr/bin/qemu-arm-static:/usr/bin/qemu-arm-static "arm32v7/ubuntu:jammy" /bin/bash -c "cd /MuseScore && \ + sudo docker run --platform linux/arm -i -v "${PWD}:/MuseScore" -v /usr/bin/qemu-arm-static:/usr/bin/qemu-arm-static "arm32v7/ubuntu:jammy" /bin/bash -c "cd /MuseScore && \ bash /MuseScore/buildscripts/ci/linux/setup-arm.sh --arch armv7l && \ bash /MuseScore/buildscripts/ci/linux/build.sh -n ${{ env.BUILD_NUMBER }} --crash_log_url $C_URL --arch armv7l && \ bash /MuseScore/buildscripts/ci/linux/package.sh --arch armv7l && \ @@ -302,7 +302,7 @@ jobs: run: | C_URL=${SENTRY_URL}; if [ -z "$C_URL" ]; then C_URL="''"; fi - sudo docker run -i -v "${PWD}:/MuseScore" -v /usr/bin/qemu-aarch64-static:/usr/bin/qemu-aarch64-static "arm64v8/ubuntu:jammy" /bin/bash -c "cd /MuseScore && \ + sudo docker run --platform linux/arm64 -i -v "${PWD}:/MuseScore" -v /usr/bin/qemu-aarch64-static:/usr/bin/qemu-aarch64-static "arm64v8/ubuntu:jammy" /bin/bash -c "cd /MuseScore && \ bash /MuseScore/buildscripts/ci/linux/setup-arm.sh --arch aarch64 && \ bash /MuseScore/buildscripts/ci/linux/build.sh -n ${{ env.BUILD_NUMBER }} --crash_log_url $C_URL --arch aarch64 && \ bash /MuseScore/buildscripts/ci/linux/package.sh --arch aarch64 && \