Skip to content

Commit b79a221

Browse files
committed
Fix finding Docker image for ARM Linux builds
1 parent 4221e1d commit b79a221

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/build_linux_arm.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ jobs:
173173
run: |
174174
C_URL=${SENTRY_URL}; if [ -z "$C_URL" ]; then C_URL="''"; fi
175175
176-
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 && \
176+
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 && \
177177
bash /MuseScore/buildscripts/ci/linux/setup-arm.sh --arch armv7l && \
178178
bash /MuseScore/buildscripts/ci/linux/build.sh -n ${{ env.BUILD_NUMBER }} --crash_log_url $C_URL --arch armv7l && \
179179
bash /MuseScore/buildscripts/ci/linux/package.sh --arch armv7l && \
@@ -302,7 +302,7 @@ jobs:
302302
run: |
303303
C_URL=${SENTRY_URL}; if [ -z "$C_URL" ]; then C_URL="''"; fi
304304
305-
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 && \
305+
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 && \
306306
bash /MuseScore/buildscripts/ci/linux/setup-arm.sh --arch aarch64 && \
307307
bash /MuseScore/buildscripts/ci/linux/build.sh -n ${{ env.BUILD_NUMBER }} --crash_log_url $C_URL --arch aarch64 && \
308308
bash /MuseScore/buildscripts/ci/linux/package.sh --arch aarch64 && \

src/framework/musesampler/internal/musesamplerresolver.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ InstrumentInfo findInstrument(MuseSamplerLibHandlerPtr libHandler, const AudioRe
8585

8686
void MuseSamplerResolver::init()
8787
{
88-
if (doInit(configuration()->userLibraryPath())) {
89-
return;
90-
}
88+
// if (doInit(configuration()->userLibraryPath())) {
89+
// return;
90+
// }
9191

92-
doInit(configuration()->fallbackLibraryPath());
92+
// doInit(configuration()->fallbackLibraryPath());
9393
}
9494

9595
bool MuseSamplerResolver::reloadMuseSampler()

0 commit comments

Comments
 (0)