From d534d633ad3cb78a5d446cfa94fe7ee370d78e48 Mon Sep 17 00:00:00 2001 From: Tony Mountifield Date: Mon, 17 Jun 2024 18:01:45 +0100 Subject: [PATCH 1/3] Update iOS build runner from macos-11 to macos-12 Github have deprecated macos-11 as a runner, and will remove it on 28 Jun 2024. See https://github.blog/changelog/2024-05-20-actions-upcoming-changes-to-github-hosted-macos-runners/ for the announcement. --- .github/workflows/autobuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index b839360822..d63b880301 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -250,7 +250,7 @@ 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. From f957db7d1f9e6d0da307e56f63c902fdc12d51fe Mon Sep 17 00:00:00 2001 From: Tony Mountifield Date: Tue, 18 Jun 2024 22:04:12 +0100 Subject: [PATCH 2/3] Update xcode version to 13.4.1 The macos-12 runner doesn't offer xcode 12.5.1, but only the following: 14.2.0, 14.1.0, 14.0.1, 13.4.1, 13.3.1, 13.2.1, 13.1.0 So choosing the most recent in the xcode-13 series. --- .github/workflows/autobuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index d63b880301..5627da3942 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -258,7 +258,7 @@ jobs: 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 From ccc18511b31c0197392b0f4eb2b756bd15c623ce Mon Sep 17 00:00:00 2001 From: Tony Mountifield Date: Wed, 19 Jun 2024 21:34:11 +0100 Subject: [PATCH 3/3] Disable legacy build system deprecation for now --- .github/autobuild/ios.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/autobuild/ios.sh b/.github/autobuild/ios.sh index ab52c8d0da..c5903f4045 100755 --- 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 }