Switch macOS packaging build from x86_64 to arm64

Reducing the load on the x86_64 machines.

Change-Id: I3c97fb1734d982b1de289eba7680a81b7dfce31c
Reviewed-by: Simo Fält <simo.falt@qt.io>

coin/platform_configs/cmake_platforms.yaml

@@ -228,7 +228,7 @@ Configurations:
     Target arch: 'arm64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-x86_64'
+    Platform dependency: 'macos-universal-on-arm64'
     Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure', 'WarningsAreErrors', 'GenerateSBOM', 'VerifySBOM']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang',

coin/platform_configs/cmake_platforms_target_android.yaml

@@ -7,7 +7,7 @@ Configurations:
     Target arch: 'arm64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-x86_64'
+    Platform dependency: 'macos-universal-on-arm64'
     Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',

coin/platform_configs/ios-tests.yaml

@@ -7,7 +7,7 @@ Configurations:
     Target arch: 'arm64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-x86_64'
+    Platform dependency: 'macos-universal-on-arm64'
     Features: ['PinCores', 'Sccache', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang'

coin/platform_configs/macos.yaml

@@ -7,24 +7,12 @@ Configurations:
 
     # Build on recent macOS version with latest Xcode
 
-    -
-        Id: 'macos-universal-on-x86_64'
-        Template: 'qtci-macos-14-x86_64-105'
-        Compiler: 'Clang'
-        Target arch: 'x86_64-arm64'
-        Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-        Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
-        Environment variables: [
-            'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
-            'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DQT_FEATURE_open62541_security=OFF',
-        ]
-
     -
         Id: 'macos-universal-on-arm64'
         Template: 'qtci-macos-14-arm-106'
         Compiler: 'Clang'
         Target arch: 'x86_64-arm64'
-        Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+        Features: ['Packaging', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
         Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
         Environment variables: [
             'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
@@ -40,19 +28,19 @@ Configurations:
         Template: 'qtci-macos-13-x86_64-103'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
+        Platform dependency: 'macos-universal-on-arm64'
     -
         Id: 'macos-14-x86_64-tests'
         Template: 'qtci-macos-14-x86_64-105'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
+        Platform dependency: 'macos-universal-on-arm64'
     -
         Id: 'macos-15-x86_64-tests'
         Template: 'qtci-macos-15-x86_64-103'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
+        Platform dependency: 'macos-universal-on-arm64'
         Environment variables: [ 'COIN_CTEST_IGNORE_EXIT_CODE=1' ]
 
     # And arm64
@@ -62,46 +50,18 @@ Configurations:
         Template: 'qtci-macos-13-arm-107'
         Compiler: 'Clang'
         Features: ['TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
+        Platform dependency: 'macos-universal-on-arm64'
     -
         Id: 'macos-14-arm64-tests'
         Template: 'qtci-macos-14-arm-106'
         Compiler: 'Clang'
         Features: ['TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
+        Platform dependency: 'macos-universal-on-arm64'
     -
         Id: 'macos-15-arm64-tests'
         Template: 'qtci-macos-15-arm-104'
         Compiler: 'Clang'
         Features: ['TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
-        Environment variables: [ 'COIN_CTEST_IGNORE_EXIT_CODE=1' ]
-
-    # Test the universal packaging built on arm64
-
-    -
-        Id: 'macos-13-arm-on-arm64-tests'
-        Template: 'qtci-macos-13-arm-107'
-        Compiler: 'Clang'
-        Features: ['TestOnly']
-        Platform dependency: 'macos-universal-on-arm64'
-    -
-        Id: 'macos-13-arm-on-x86_64-tests'
-        Template: 'qtci-macos-13-x86_64-103'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-universal-on-arm64'
-    -
-        Id: 'macos-14-arm-on-x86_64-tests'
-        Template: 'qtci-macos-14-x86_64-105'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-universal-on-arm64'
-    -
-        Id: 'macos-15-arm-on-x86_64-tests'
-        Template: 'qtci-macos-15-x86_64-103'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
         Platform dependency: 'macos-universal-on-arm64'
         Environment variables: [ 'COIN_CTEST_IGNORE_EXIT_CODE=1' ]
 

coin/platform_configs/qtsaferenderer-runtime.yaml

@@ -1,7 +1,7 @@
 Version: 2
 Include: [
   macos.yaml: [
-     "macos-universal-on-x86_64",
+     "macos-universal-on-arm64",
      "macos-13-x86_64-tests",
      "macos-13-arm-on-arm64-tests"
   ],

coin/platform_configs/qtsaferenderer.yaml

@@ -1,7 +1,7 @@
 Version: 2
 Include: [
   macos.yaml: [
-     "macos-universal-on-x86_64",
+     "macos-universal-on-arm64",
      "macos-14-x86_64-tests",
      "macos-14-arm64-tests"
   ],

coin/platform_configs/tqtc-android-automotive.yaml

@@ -7,7 +7,7 @@ Include: [
         'ubuntu-22.04-developer-build-x11-tests'
     ],
     macos.yaml: [
-        'macos-universal-on-x86_64'
+        'macos-universal-on-arm64'
     ],
     cmake_platforms_target_android.yaml: [
         'android-arm64-on-macos',

coin/platform_configs/tqtc-qtpip.yaml

@@ -6,7 +6,7 @@ Include: [
     "rhel-8.10"
   ],
   macos.yaml: [
-    "macos-universal-on-x86_64"
+    "macos-universal-on-arm64"
   ]
 ]
 Configurations: []