coin: Run macOS x86_64 developer build tests for all modules

Aligns the way we test x86_64 and arm64 developer builds.

Pick-to: 6.2 6.3
Change-Id: I87ea5e183b5ee29c62304b22eaf20c4b46ec3b0d
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

coin/platform_configs/macos-developer-build-tests.yaml

@@ -1,30 +0,0 @@
-Version: 2
-Configurations:
-
-    # These developer-build tests are only run for qtbase and qtdeclarative
-    # See macos.yaml for arm64 developer-build tests, run for all modules.
-
-    -
-        Id: 'macos-10.14-x86_64-developer-build-tests'
-        Template: 'qtci-macos-10.14-x86_64'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
-    -
-        Id: 'macos-10.15-x86_64-developer-build-tests'
-        Template: 'qtci-macos-10.15-x86_64-102'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
-    -
-        Id: 'macos-11-x86_64-developer-build-tests'
-        Template: 'qtci-macos-11-x86_64-104'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
-    -
-        Id: 'macos-12-x86_64-developer-build-tests'
-        Template: 'qtci-macos-12-x86_64-102'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'

coin/platform_configs/macos.yaml

@@ -81,18 +81,39 @@ Configurations:
 
     # Test on all supported macOS versions (deployment targets)
 
+    -
+        Id: 'macos-10.14-x86_64-developer-build-tests'
+        Template: 'qtci-macos-10.14-x86_64'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly']
+        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
+    -
+        Id: 'macos-10.15-x86_64-developer-build-tests'
+        Template: 'qtci-macos-10.15-x86_64-102'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly']
+        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
+    -
+        Id: 'macos-11-x86_64-developer-build-tests'
+        Template: 'qtci-macos-11-x86_64-104'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly']
+        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
     -
         Id: 'macos-11-arm64-developer-build-tests'
         Template: 'qtci-macos-11.0-arm64'
         Compiler: 'Clang'
         Features: ['TestOnly']
         Platform dependency: 'macos-latest-xcode-arm64-developer-build'
+    -
+        Id: 'macos-12-x86_64-developer-build-tests'
+        Template: 'qtci-macos-12-x86_64-102'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly']
+        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
     -
         Id: 'macos-12-arm64-developer-build-tests'
         Template: 'qtci-macos-12-arm64'
         Compiler: 'Clang'
         Features: ['TestOnly']
         Platform dependency: 'macos-latest-xcode-arm64-developer-build'
-
-    # See macos-developer-build-tests.yaml for x86_64 tests,
-    # as we limit those to qtbase and declarative.

coin/platform_configs/qtbase.yaml

@@ -2,7 +2,6 @@ Version: 2
 Include: [
     cmake_platforms.yaml,
     cmake_platforms_static_tests.yaml,
-    macos-developer-build-tests.yaml,
     integrity.yaml,
     ios-tests.yaml,
     linux_android_tests.yaml

coin/platform_configs/qtdeclarative.yaml

@@ -1,7 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    macos-developer-build-tests.yaml,
     integrity.yaml,
     cmake_platforms_static_tests.yaml,
     linux_android_tests.yaml

coin/platform_configs/qtwebengine.yaml

@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
+    cmake_platforms.yaml
-    macos-developer-build-tests.yaml
 ]
 Configurations: []