aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToni Saario <toni.saario@qt.io>2022-06-01 16:30:37 +0300
committerToni Saario <toni.saario@qt.io>2022-06-07 13:18:41 +0300
commit43a461de46dee6d5b71cfb398ffd347304312ae3 (patch)
tree4a38542a361c6dda270a3e85bc517fc4da798561
parent2046e36ee9a5f0cadc3caac136b2d6cb4b079571 (diff)
Coin: Add precheck yaml
Defines configurations that will run on default precheck. Pick-to: 6.3 6.4 Change-Id: Idb7d3981b2679c3714f86a92808e90fe33aaf136 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
-rw-r--r--coin/platform_configs/cmake_platforms.yaml1
-rw-r--r--coin/platform_configs/cmake_platforms_qemu.yaml1
-rw-r--r--coin/platform_configs/cmake_platforms_qemu_qnx710.yaml1
-rw-r--r--coin/platform_configs/cmake_platforms_static_tests.yaml1
-rw-r--r--coin/platform_configs/cmake_platforms_target_android_host_macos.yaml1
-rw-r--r--coin/platform_configs/integrity.yaml1
-rw-r--r--coin/platform_configs/precheck.yaml28
7 files changed, 34 insertions, 0 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml
index a2f8ecf1..b6c4337e 100644
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -120,6 +120,7 @@ Configurations:
Environment variables: [
'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc']
-
+ Id: 'ios-universal'
Template: 'qtci-macos-11-x86_64-104'
Target os: 'IOS_ANY'
Target arch: 'arm64'
diff --git a/coin/platform_configs/cmake_platforms_qemu.yaml b/coin/platform_configs/cmake_platforms_qemu.yaml
index 629b46df..87c329fc 100644
--- a/coin/platform_configs/cmake_platforms_qemu.yaml
+++ b/coin/platform_configs/cmake_platforms_qemu.yaml
@@ -1,6 +1,7 @@
Version: 2
Configurations:
-
+ Id: 'qemu-armv7-on-ubuntu20.04'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Target os: 'QEMU'
Target arch: 'armv7'
diff --git a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml
index a0f5a36c..a418911c 100644
--- a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml
+++ b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml
@@ -1,6 +1,7 @@
Version: 2
Configurations:
-
+ Id: 'qnx-x86_64-on-ubuntu20.04'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Target os: 'QNX_710'
Target arch: 'x86_64'
diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml
index fc0c5a9f..ec44d6c2 100644
--- a/coin/platform_configs/cmake_platforms_static_tests.yaml
+++ b/coin/platform_configs/cmake_platforms_static_tests.yaml
@@ -1,6 +1,7 @@
Version: 2
Configurations:
-
+ Id: 'sles-15-static'
Template: 'qtci-linux-SLES-15_SP3-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'MinimalStaticTests']
diff --git a/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml b/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml
index 96db0ce7..2786dc1f 100644
--- a/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml
@@ -1,6 +1,7 @@
Version: 2
Configurations:
-
+ Id: 'android-arm64-on-macos'
Template: 'qtci-macos-10.14-x86_64'
Target os: 'Android_ANY'
Target arch: 'arm64'
diff --git a/coin/platform_configs/integrity.yaml b/coin/platform_configs/integrity.yaml
index 29553169..8049ab89 100644
--- a/coin/platform_configs/integrity.yaml
+++ b/coin/platform_configs/integrity.yaml
@@ -1,6 +1,7 @@
Version: 2
Configurations:
-
+ Id: "integrity-arm64-on-ubuntu20.04"
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Target os: 'INTEGRITY'
diff --git a/coin/platform_configs/precheck.yaml b/coin/platform_configs/precheck.yaml
new file mode 100644
index 00000000..b0c63450
--- /dev/null
+++ b/coin/platform_configs/precheck.yaml
@@ -0,0 +1,28 @@
+Version: 2
+Module only: True
+Include: [
+ cmake_platforms.yaml: [
+ "Ubuntu-20.04-host",
+ "Windows10_21H2-MSVC2019-x64-host",
+ "ios-universal"
+ ],
+ macos.yaml: [
+ "macos-12-arm64-tests",
+ ],
+ cmake_platforms_static_tests.yaml: [
+ "sles-15-static"
+ ],
+ cmake_platforms_target_android_host_macos.yaml: [
+ "android-arm64-on-macos"
+ ],
+ cmake_platforms_qemu.yaml: [
+ "qemu-armv7-on-ubuntu20.04"
+ ],
+ cmake_platforms_qemu_qnx710.yaml: [
+ "qnx-x86_64-on-ubuntu20.04"
+ ],
+ integrity.yaml: [
+ "integrity-arm64-on-ubuntu20.04"
+ ]
+]
+Configurations: []