test arm64e/mac m1 builds

hoffie · Feb 5, 2022 · 79945e6 · 79945e6
1 parent 4292008
commit 79945e6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 56 deletions.
diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
@@ -92,66 +92,15 @@ jobs:
       fail-fast:                    false
       matrix: # Think of this like a foreach loop. Basically runs the steps with every combination of the contents of this. More info: https://docs.github.com/en/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
         config:
-           - config_name:           AndroidAPK (artifact+codeQL)
-             target_os:             android
-             building_on_os:        ubuntu-20.04
-             cmd1_prebuild:         "sh ./autobuild/android/autobuild_apk_1_prepare.sh" # this step needs sh instead of bash for permissions
-             cmd2_build:            "./autobuild/android/autobuild_apk_2_build.sh"
-             cmd3_postbuild:        "./autobuild/android/autobuild_apk_3_copy_files.sh"
-             uses_codeql:           true
-
-           - config_name:           Linux (artifacts+codeQL)
-             target_os:             linux
-             building_on_os:        ubuntu-18.04
-             cmd1_prebuild:         "sh ./autobuild/linux/autobuild_deb_1_prepare.sh" # this step needs sh instead of bash for permissions
-             cmd2_build:            "./autobuild/linux/autobuild_deb_2_build.sh"
-             cmd3_postbuild:        "./autobuild/linux/autobuild_deb_3_copy_files.sh"
-             uses_codeql:           true
-
-           - config_name:           MacOS (codeQL)
-             target_os:             macos
-             building_on_os:        macos-10.15
-             cmd1_prebuild:         "./autobuild/mac/codeQL/autobuild_mac_1_prepare.sh 5.15.2"
-             cmd2_build:            "./autobuild/mac/codeQL/autobuild_mac_2_build.sh"
-             cmd3_postbuild:        false
-             uses_codeql:           true
-
-           - config_name:           MacOS (artifacts)
+           - config_name:           MacOS arm64 (artifacts)
              target_os:             macos
              # Stay on 10.15 as long as we use dmgbuild which does not work with 11's hdiutil (?)
-             building_on_os:        macos-10.15
-             cmd1_prebuild:         "./autobuild/mac/artifacts/autobuild_mac_1_prepare.sh 5.15.2"
+             building_on_os:        macos-11
+             cmd1_prebuild:         "./autobuild/mac/artifacts/autobuild_mac_1_prepare.sh 6.2.2"
              cmd2_build:            "./autobuild/mac/artifacts/autobuild_mac_2_build.sh sign_if_possible"
              cmd3_postbuild:        "./autobuild/mac/artifacts/autobuild_mac_3_copy_files.sh"
              uses_codeql:           false
-             xcode_version:         11.7
-
-           - config_name:           MacOS Legacy (artifacts)
-             target_os:             macos
-             building_on_os:        macos-10.15
-             cmd1_prebuild:         "./autobuild/mac/artifacts/autobuild_mac_1_prepare.sh 5.9.9"
-             cmd2_build:            "./autobuild/mac/artifacts/autobuild_mac_2_build.sh do_not_sign"
-             cmd3_postbuild:        "./autobuild/mac/artifacts/autobuild_mac_3_copy_files.sh legacy"
-             uses_codeql:           false
-             # For Qt5 on Mac, we need to ensure SDK 10.15 is used, and not SDK 11.x
-             # This is done by selecting Xcode 11.7 instead of the latest default of 12.x
-             xcode_version:         11.7
-
-           - config_name:           Windows (artifact+codeQL)
-             target_os:             windows
-             building_on_os:        windows-2019
-             cmd1_prebuild:         powershell .\autobuild\windows\autobuild_windowsinstaller_1_prepare.ps1
-             cmd2_build:            powershell .\autobuild\windows\autobuild_windowsinstaller_2_build.ps1
-             cmd3_postbuild:        powershell .\autobuild\windows\autobuild_windowsinstaller_3_copy_files.ps1
-             uses_codeql:           true
-
-           - config_name:           Windows JACK (artifact)
-             target_os:             windows
-             building_on_os:        windows-2019
-             cmd1_prebuild:         powershell .\autobuild\windows\autobuild_windowsinstaller_1_prepare.ps1 -BuildOption jackonwindows
-             cmd2_build:            powershell .\autobuild\windows\autobuild_windowsinstaller_2_build.ps1 -BuildOption jackonwindows
-             cmd3_postbuild:        powershell .\autobuild\windows\autobuild_windowsinstaller_3_copy_files.ps1 -BuildOption jackonwindows
-             uses_codeql:           false
+             xcode_version:         13.2.1
 
     runs-on:                        ${{ matrix.config.building_on_os }}
     steps:

diff --git a/mac/deploy_mac.sh b/mac/deploy_mac.sh
@@ -43,7 +43,7 @@ cleanup()
 build_app()
 {
     # Build Jamulus
-    qmake "${project_path}" -o "${build_path}/Makefile" "CONFIG+=release" ${@:2}
+    qmake "${project_path}" -o "${build_path}/Makefile" "CONFIG+=release" QMAKE_APPLE_DEVICE_ARCHS="arm64" QT_ARCH="arm64" ${@:2}
     local target_name="$(cat "${build_path}/Makefile" | sed -nE 's/^QMAKE_TARGET *= *(.*)$/\1/p')"
     local job_count="$(sysctl -n hw.ncpu)"