From a1a2a0b0487a90978b37841fb0b9370672be7afa Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Mon, 4 Oct 2021 08:42:29 +0300
Subject: [PATCH] Coin: extend CI coverage to older yocto branches

Add dunfell and hardknott to the CI build. Skip building QtWebEngine
in dunfell, since it required newer cmake than dunfell can offer.
As Gatesgarth is already EOL, do not add it to testing although
it is still listed as compatible version.

Task-number: QTBUG-97065
Change-Id: I3538d756294043fae119c78d018c61be766f2538
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
---
 README.md               | 17 ++++++++++++-----
 coin/module_config.yaml |  6 +++---
 coin/test-dunfell.inc   |  1 +
 3 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 coin/test-dunfell.inc

diff --git a/README.md b/README.md
index 59c45ba..90114c9 100644
--- a/README.md
+++ b/README.md
@@ -17,14 +17,21 @@ The branching of meta-qt6 layer follows Qt branching scheme, that is
 `dev` for the development branch, and `6.x` for each minor release.
 
 Following table shows the Yocto branches which are used to test each
-Qt version.
+Qt version (x) and any additional Yocto release that are stated in
+the LAYERSERIES_COMPAT (c).
 
 | Yocto \ Qt | dev | 6.2 | 6.1 | 6.0 |
 | ---------- |:---:|:---:|:---:|:---:|
-| master     |  x  |     |     |     |
-| hardknott  |     |  x  |  x  |  x  |
-| gatesgarth |     |  x  |  x  |  x  |
-| dunfell    |     |  x  |  x  |  x  |
+| master     |  x  |  x  |     |     |
+| hardknott  |  x  |  x  |  x  |  x  |
+| gatesgarth |  c  |  x  |  x  |  x  |
+| dunfell    |  x  |  x  |  x  |  x  |
+
+QtWebEngine
+-----------
+
+QtWebEngine needs at least CMake 3.19, which is available starting from Hardknott.
+For this reason QtWebEngine is not tested on older releases.
 
 Contributing
 ------------
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index aa4eaa8..09d3b21 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -17,7 +17,7 @@ machine_type:
 #
 #           [target1]       [target2]   [target3]       [target4]
 # [machine] qemuarm64       qemux86     qemuarm         qemux86-64
-# [yocto]   master          master      master          master
+# [yocto]   master          master      hardknott       dunfell
 # [X11]     no              no          yes             yes
 # [mingw]   no              yes         no              no
 #
@@ -65,7 +65,7 @@ target3: &target3
       variableValue: qemuarm
     - type: EnvironmentVariable
       variableName: YOCTO_BRANCH
-      variableValue: master
+      variableValue: hardknott
   enable_if:
       condition: property
       property: target.arch
@@ -78,7 +78,7 @@ target4: &target4
       variableValue: qemux86-64
     - type: EnvironmentVariable
       variableName: YOCTO_BRANCH
-      variableValue: master
+      variableValue: dunfell
   enable_if:
       condition: property
       property: target.arch
diff --git a/coin/test-dunfell.inc b/coin/test-dunfell.inc
new file mode 100644
index 0000000..1827495
--- /dev/null
+++ b/coin/test-dunfell.inc
@@ -0,0 +1 @@
+DISTRO_FEATURES_remove = "webengine"