Merge pull request #2682 from hoffie/autobuild/add-mac-arm64e

Autobuild: Add macOS M1 (arm64) build target
jamulussoftware · Jul 6, 2022 · 514f78f · 514f78f
2 parents 6744342 + 1331b11
commit 514f78f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/.github/autobuild/mac.sh b/.github/autobuild/mac.sh
@@ -4,6 +4,8 @@ set -eu
 QT_DIR=/usr/local/opt/qt
 AQTINSTALL_VERSION=2.1.0
 
+TARGET_ARCH="${TARGET_ARCH:-}"
+
 if [[ ! ${QT_VERSION:-} =~ [0-9]+\.[0-9]+\..* ]]; then
     echo "Environment variable QT_VERSION must be set to a valid Qt version"
     exit 1
@@ -67,7 +69,7 @@ build_app_as_dmg_installer() {
     if prepare_signing; then
         BUILD_ARGS=("-s" "${MACOS_CERTIFICATE_ID}")
     fi
-    ./mac/deploy_mac.sh "${BUILD_ARGS[@]}"
+    TARGET_ARCH="${TARGET_ARCH}" ./mac/deploy_mac.sh "${BUILD_ARGS[@]}"
 }
 
 pass_artifact_to_job() {

diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
@@ -139,6 +139,14 @@ jobs:
             # Latest Xcode which runs on macos-11:
             xcode_version:          13.4.1
 
+          - config_name:            MacOS arm64 (artifacts)
+            target_os:              macos
+            building_on_os:         macos-12
+            base_command:           QT_VERSION=6.3.1 SIGN_IF_POSSIBLE=1 TARGET_ARCH=arm64 ARTIFACT_SUFFIX=_arm64 ./.github/autobuild/mac.sh
+            # Disable CodeQL on mac as it interferes with signing the binaries (signing hangs, see #2563 and #2564)
+            run_codeql:             false
+            xcode_version:          13.4.1
+
           # Reminder: If Legacy is removed, be sure to add a dedicated job for CodeQL again.
           - config_name:            MacOS Legacy (artifacts+CodeQL)
             target_os:              macos

diff --git a/mac/deploy_mac.sh b/mac/deploy_mac.sh
@@ -38,7 +38,11 @@ build_app() {
     local client_or_server="${1}"
 
     # Build Jamulus
-    qmake "${project_path}" -o "${build_path}/Makefile" "CONFIG+=release" "${@:2}"
+    declare -a BUILD_ARGS=("_UNUSED_DUMMY=''")  # old bash fails otherwise
+    if [[ "${TARGET_ARCH:-}" ]]; then
+        BUILD_ARGS=("QMAKE_APPLE_DEVICE_ARCHS=${TARGET_ARCH}" "QT_ARCH=${TARGET_ARCH}")
+    fi
+    qmake "${project_path}" -o "${build_path}/Makefile" "CONFIG+=release" "${BUILD_ARGS[@]}" "${@:2}"
     local target_name
     target_name=$(sed -nE 's/^QMAKE_TARGET *= *(.*)$/\1/p' "${build_path}/Makefile")
     local job_count