From a8efef7a0dc364c573824f8de6399129dc3be10f Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 11 May 2023 10:45:13 +0000 Subject: [PATCH] Add macOS 13 x86_64 to CI as build and test target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit macOS 12 x86_64 will be replace with macOS 13. Tests will be still run on macOS 12 Let's keep same Xcode version (14.2) than older macOS (12) has Task-number: QTBUG-104210 Change-Id: If3e06834156196917001f83ca391a66a6c78e84a Reviewed-by: Tor Arne Vestbø (cherry picked from commit ac33d86e9ab56cce7f866a69c3f91f7bb4fd5733) Reviewed-by: Ville-Pekka Karhu --- coin/platform_configs/cmake_platforms.yaml | 2 +- .../cmake_platforms_target_android.yaml | 2 +- .../cmake_platforms_wasm.yaml | 2 +- coin/platform_configs/macos.yaml | 29 +++++++++++++++---- coin/platform_configs/qmake2cmake.yaml | 2 +- .../qtci-macos-13-arm/20-xcode.sh | 2 +- .../21-install-commandlinetools.sh | 4 +-- .../qtci-macos-13-x86_64/20-xcode.sh | 2 +- .../21-install-commandlinetools.sh | 4 +-- 9 files changed, 33 insertions(+), 16 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index f4535f3c..b3643d47 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -208,7 +208,7 @@ Configurations: - Id: 'ios-universal' - Template: 'qtci-macos-12-x86_64-106' + Template: 'qtci-macos-13-x86_64-103' Target os: 'IOS_ANY' Target arch: 'arm64' Compiler: 'Clang' diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 12014749..1e137099 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -2,7 +2,7 @@ Version: 2 Configurations: - Id: 'android-arm64-on-macos' - Template: 'qtci-macos-12-x86_64-106' + Template: 'qtci-macos-13-x86_64-103' Target os: 'Android_ANY' Target arch: 'arm64' Compiler: 'Clang' diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index 39d8f60b..58eb9909 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -29,7 +29,7 @@ Configurations: ] - Id: 'webassembly-macos-thread' - Template: 'qtci-macos-12-x86_64-106' + Template: 'qtci-macos-13-x86_64-103' Target os: 'WebAssembly' Compiler: 'Clang' Target compiler: 'Clang' diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 4cea863e..b6c2af0f 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -9,7 +9,7 @@ Configurations: - Id: 'macos-universal-on-x86_64' - Template: 'qtci-macos-12-x86_64-106' + Template: 'qtci-macos-13-x86_64-103' Compiler: 'Clang' Target arch: 'x86_64-arm64' Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] @@ -65,6 +65,12 @@ Configurations: Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'Packaging'] Platform dependency: 'macos-universal-on-x86_64' + - + Id: 'macos-13-x86_64-tests' + Template: 'qtci-macos-13-x86_64-103' + Compiler: 'Clang' + Features: ['Sccache', 'TestOnly', 'Packaging'] + Platform dependency: 'macos-universal-on-x86_64' - Id: 'macos-12-arm-on-arm64-tests' Template: 'qtci-macos-12-arm64' @@ -77,7 +83,12 @@ Configurations: Compiler: 'Clang' Features: ['Sccache', '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' # ========================================================================= # Developer build. Single architecture builds. # ========================================================================= @@ -85,8 +96,8 @@ Configurations: # Build on recent macOS version with latest Xcode - - Id: 'macos-12-x86_64-developer-build' - Template: 'qtci-macos-12-x86_64-106' + Id: 'macos-13-x86_64-developer-build' + Template: 'qtci-macos-13-x86_64-103' Compiler: 'Clang' Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples' @@ -115,7 +126,7 @@ Configurations: Template: 'qtci-macos-11-x86_64-106' Compiler: 'Clang' Features: ['Sccache', 'TestOnly'] - Platform dependency: 'macos-12-x86_64-developer-build' + Platform dependency: 'macos-13-x86_64-developer-build' - Id: 'macos-11-arm64-developer-build-tests' Template: 'qtci-macos-11.0-arm64' @@ -127,13 +138,19 @@ Configurations: Template: 'qtci-macos-12-x86_64-106' Compiler: 'Clang' Features: ['Sccache', 'TestOnly'] - Platform dependency: 'macos-12-x86_64-developer-build' + Platform dependency: 'macos-13-x86_64-developer-build' - Id: 'macos-12-arm64-developer-build-tests' Template: 'qtci-macos-12-arm64' Compiler: 'Clang' Features: ['TestOnly'] Platform dependency: 'macos-13-arm64-developer-build' + - + Id: 'macos-13-x86_64-developer-build-tests' + Template: 'qtci-macos-13-x86_64-103' + Compiler: 'Clang' + Features: ['Sccache', 'TestOnly'] + Platform dependency: 'macos-13-x86_64-developer-build' - Id: 'macos-13-arm64-developer-build-tests' Template: 'qtci-macos-13-arm64' diff --git a/coin/platform_configs/qmake2cmake.yaml b/coin/platform_configs/qmake2cmake.yaml index f44aef73..13712803 100644 --- a/coin/platform_configs/qmake2cmake.yaml +++ b/coin/platform_configs/qmake2cmake.yaml @@ -6,7 +6,7 @@ Configurations: Compiler: 'MSVC2019' Features: ['DisableTests'] - - Template: 'qtci-macos-12-x86_64-106' + Template: 'qtci-macos-13-x86_64-103' Compiler: 'Clang' Features: ['DisableTests'] - diff --git a/coin/provisioning/qtci-macos-13-arm/20-xcode.sh b/coin/provisioning/qtci-macos-13-arm/20-xcode.sh index 7d226223..a062b6e2 100755 --- a/coin/provisioning/qtci-macos-13-arm/20-xcode.sh +++ b/coin/provisioning/qtci-macos-13-arm/20-xcode.sh @@ -56,4 +56,4 @@ set -ex # shellcheck source=../common/macos/install_xcode.sh source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" -InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_14.3.xip 14.3 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_14.2.xip 14.2 diff --git a/coin/provisioning/qtci-macos-13-arm/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-13-arm/21-install-commandlinetools.sh index 2d0f1052..3777e52f 100755 --- a/coin/provisioning/qtci-macos-13-arm/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-13-arm/21-install-commandlinetools.sh @@ -43,9 +43,9 @@ set -ex # shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="14.3" +version="14.2" packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" -sha1="bd255759d8733c7ea820ebc6ad8f65114e42d36d" +sha1="f9d18da696bc54755bd85fb4f42c0a8866bdade6" InstallCommandLineTools $url $url $sha1 $packageName $version diff --git a/coin/provisioning/qtci-macos-13-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-13-x86_64/20-xcode.sh index a5f9a7eb..45924783 100755 --- a/coin/provisioning/qtci-macos-13-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-13-x86_64/20-xcode.sh @@ -56,4 +56,4 @@ set -ex # shellcheck source=../common/macos/install_xcode.sh source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" -InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_14.3.xip 14.3 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_14.2.xip 14.2 diff --git a/coin/provisioning/qtci-macos-13-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-13-x86_64/21-install-commandlinetools.sh index b4e61699..25b9b9b5 100755 --- a/coin/provisioning/qtci-macos-13-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-13-x86_64/21-install-commandlinetools.sh @@ -43,9 +43,9 @@ set -ex # shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="14.3" +version="14.2" packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" -sha1="bd255759d8733c7ea820ebc6ad8f65114e42d36d" +sha1="f9d18da696bc54755bd85fb4f42c0a8866bdade6" InstallCommandLineTools $url $url $sha1 $packageName $version