Skip to content

Commit e016c4c

Browse files
committed
Adjust setup script for linux arm64 runners
1 parent c263da0 commit e016c4c

File tree

3 files changed

+163
-302
lines changed

3 files changed

+163
-302
lines changed

.github/workflows/build_linux_arm.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,11 @@ jobs:
155155
C_URL=${SENTRY_URL}; if [ -z "$C_URL" ]; then C_URL="''"; fi
156156
157157
# Re. `export QT_SELECT=qt6`, see https://askubuntu.com/questions/1460242/ubuntu-22-04-with-qt6-qmake-could-not-find-a-qt-installation-of
158-
# and accompanying `qtchooser` comment in `buildscripts/ci/linux/setup-arm.sh`.
158+
# and accompanying `qtchooser` comment in `buildscripts/ci/linux/setup.sh`.
159159
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 "\
160160
cd /MuseScore && \
161161
export QT_SELECT=qt6 && \
162-
bash /MuseScore/buildscripts/ci/linux/setup-arm.sh --arch armv7l && \
162+
bash /MuseScore/buildscripts/ci/linux/setup.sh --arch armv7l && \
163163
bash /MuseScore/buildscripts/ci/translation/run_lupdate.sh && \
164164
bash /MuseScore/buildscripts/ci/linux/build.sh -n ${{ env.BUILD_NUMBER }} --crash_log_url $C_URL --arch armv7l && \
165165
bash /MuseScore/buildscripts/ci/linux/package.sh --arch armv7l && \
@@ -275,7 +275,7 @@ jobs:
275275
276276
- name: Setup environment
277277
run: |
278-
bash ./buildscripts/ci/linux/setup-arm.sh --arch aarch64
278+
bash ./buildscripts/ci/linux/setup.sh --arch aarch64
279279
- name: Generate _en.ts files
280280
env:
281281
LUPDATE_ARGS: ""

buildscripts/ci/linux/setup-arm.sh

-241
This file was deleted.

0 commit comments

Comments
 (0)