Fix finding Docker image for ARM Linux builds

musescore · Oct 23, 2024 · b79a221 · b79a221
1 parent 4221e1d
commit b79a221
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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 && \

diff --git a/src/framework/musesampler/internal/musesamplerresolver.cpp b/src/framework/musesampler/internal/musesamplerresolver.cpp
@@ -85,11 +85,11 @@ InstrumentInfo findInstrument(MuseSamplerLibHandlerPtr libHandler, const AudioRe
 
 void MuseSamplerResolver::init()
 {
-    if (doInit(configuration()->userLibraryPath())) {
-        return;
-    }
+    // if (doInit(configuration()->userLibraryPath())) {
+    //     return;
+    // }
 
-    doInit(configuration()->fallbackLibraryPath());
+    // doInit(configuration()->fallbackLibraryPath());
 }
 
 bool MuseSamplerResolver::reloadMuseSampler()