diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2023-01-02 06:46:01 +0000 |
|---|---|---|
| committer | Heikki Halmet <heikki.halmet@qt.io> | 2023-01-02 11:48:47 +0000 |
| commit | 93f804ed73894ce3484947a7fd345cb6b69a84ac (patch) | |
| tree | 847a270262fa45dfa0fb8188a434567f02475772 | |
| parent | e9b2c15201987af0bdb45f01aaacd2e525415f48 (diff) | |
Include platform dependency targets to android nightly yaml
Also update windows target to use latest windows version
Change-Id: If4e5568f4d138cba21296176e056757f59061bdb
Reviewed-by: Toni Saario <toni.saario@qt.io>
| -rw-r--r-- | coin/platform_configs/nightly_cmake_platforms_target_android_latest.yaml | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/coin/platform_configs/nightly_cmake_platforms_target_android_latest.yaml b/coin/platform_configs/nightly_cmake_platforms_target_android_latest.yaml index f93f2887..dfcbf5ce 100644 --- a/coin/platform_configs/nightly_cmake_platforms_target_android_latest.yaml +++ b/coin/platform_configs/nightly_cmake_platforms_target_android_latest.yaml @@ -1,4 +1,13 @@ Version: 2 +Include: [ + cmake_platforms.yaml: [ + Windows10_22H2-Mingw11-x64-host, + RHEL-8.4-host + ], + macos.yaml: [ + macos-latest-xcode-universal-packaging-build + ] +] Configurations: - Id: 'android-arm64-on-macos' @@ -17,12 +26,12 @@ Configurations: 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}' ] - - Template: 'qtci-windows-10_21H2-x86_64-51' + Template: 'qtci-windows-10_22H2-x86_64-50' Target os: 'Android_ANY' Target arch: 'armv7' Compiler: 'Mingw' Target compiler: 'Clang' - Platform dependency: 'Windows10_21H2-Mingw11-x64-host' + Platform dependency: 'Windows10_22H2-Mingw11-x64-host' Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', |