Switch autobuild OS to ARM runner

ann0see · Jan 24, 2025 · 0d984ac · 0d984ac
1 parent fe88e3e
commit 0d984ac
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/autobuild/linux_deb.sh b/.github/autobuild/linux_deb.sh
@@ -50,18 +50,19 @@ esac
 
 setup() {
     export DEBIAN_FRONTEND="noninteractive"
+    export APT_ARCH=$(dpkg --print-architecture)
 
     setup_cross_compilation_apt_sources
 
     echo "Installing dependencies..."
     sudo apt-get -qq update
     sudo apt-get -qq --no-install-recommends -y install devscripts build-essential debhelper fakeroot libjack-jackd2-dev qtbase5-dev qttools5-dev-tools qtmultimedia5-dev
-
+    
     setup_cross_compiler
 }
 
 setup_cross_compilation_apt_sources() {
-    if [[ "${TARGET_ARCH}" == amd64 ]]; then
+    if [[ "${TARGET_ARCH}" == "${APT_ARCH}" ]]; then
         return
     fi
     sudo dpkg --add-architecture "${TARGET_ARCH}"
@@ -72,7 +73,7 @@ setup_cross_compilation_apt_sources() {
 }
 
 setup_cross_compiler() {
-    if [[ "${TARGET_ARCH}" == amd64 ]]; then
+    if [[ "${TARGET_ARCH}" == "${APT_ARCH}" ]]; then
         return
     fi
     local GCC_VERSION=9  # 9 is the default on 20.04, there is no reason not to update once 20.04 is out of support

diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
@@ -212,14 +212,14 @@ jobs:
 
           - config_name:            Linux .deb armhf (artifacts)
             target_os:              linux
-            building_on_os:         ubuntu-22.04
+            building_on_os:         ubuntu-22.04-arm
             building_container:     ubuntu:20.04
             base_command:           TARGET_ARCH=armhf ./.github/autobuild/linux_deb.sh
             run_codeql:             false
 
           - config_name:            Linux .deb arm64 (artifacts)
             target_os:              linux
-            building_on_os:         ubuntu-22.04
+            building_on_os:         ubuntu-22.04-arm
             building_container:     ubuntu:20.04
             base_command:           TARGET_ARCH=arm64 ./.github/autobuild/linux_deb.sh
             run_codeql:             false