Merge pull request #3292 from softins/build-ios-on-macos-12

jamulussoftware · Jul 2, 2024 · 579ccbc · 579ccbc
2 parents 2826f38 + ccc1851
commit 579ccbc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/autobuild/ios.sh b/.github/autobuild/ios.sh
@@ -61,6 +61,11 @@ setup() {
             # As of aqtinstall 2.1.0 / 04/2022, desktop qtbase has to be installed manually:
             python3 -m aqt install-qt --outputdir "${QT_DIR}" mac desktop "${QT_VERSION}" --archives qtbase
         fi
+
+        # Suppress deprecation of Legacy Build System for now.
+        # TODO: Legacy Build System is removed in xcode 14. Need to migrate
+        # to the Modern Build System instead.
+        /usr/libexec/PlistBuddy -c "Add :DisableBuildSystemDeprecationDiagnostic bool true" /usr/local/opt/qt/"${QT_VERSION}"/ios/mkspecs/macx-xcode/WorkspaceSettings.xcsettings
     fi
 }
 

diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
@@ -250,15 +250,15 @@ jobs:
 
           - config_name:            iOS (artifacts)
             target_os:              ios
-            building_on_os:         macos-11
+            building_on_os:         macos-12
             base_command:           QT_VERSION=5.15.2 ./.github/autobuild/ios.sh
             # Build failed with CodeQL enabled when last tested 03/2022 (#2490).
             # There are no hints that iOS is supposed to be supported by CodeQL.
             # Therefore, disable it:
             run_codeql:             false
             # Unfortunately, more modern Xcode versions no longer seem to support
             # Qt 5.15.2. Therefore upgrading to Qt6 is needed in the medium term (#2711)
-            xcode_version:          12.5.1
+            xcode_version:          13.4.1
 
           - config_name:            Windows (artifact+codeQL)
             target_os:              windows