From 0648a0a4ef171338990e9bb39e13f3de4032514f Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 4 Oct 2022 05:34:32 +0000 Subject: [PATCH] CI: tests against langdale Update CI builds to use langdale instead of honister releases. Pick-to: 6.4 Change-Id: Ib18be53b6d3308d5e4c5a2269b40ce67a4c352ee Reviewed-by: Mikko Gronoff --- README.md | 17 +++++++++-------- coin/module_config.yaml | 6 +++--- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 0ef5d52..cc2f069 100644 --- a/README.md +++ b/README.md @@ -20,14 +20,15 @@ Following table shows the Yocto branches which are used to test each Qt version (x) and any additional Yocto releases that are stated in the LAYERSERIES_COMPAT (c). -| Yocto \ Qt | dev | 6.3 | 6.2 | 6.1 | 6.0 | -| ---------- |:---:|:---:|:---:|:---:|:---:| -| master | x | | | | | -| kirkstone | x | x | x | | | -| honister | x | x | x | | | -| hardknott | c | c | c | x | x | -| gatesgarth | c | c | c | x | x | -| dunfell | x | x | x | x | x | +| Yocto \ Qt | dev | 6.4 | 6.3 | 6.2 | +| ---------- |:---:|:---:|:---:|:---:| +| master | x | x | | | +| langdale | x | x | | | +| kirkstone | x | x | x | x | +| honister | c | c | x | x | +| hardknott | c | c | c | c | +| gatesgarth | c | c | c | c | +| dunfell | x | x | x | x | Commercial Qt ------------- diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 88e55ae..dfa06f8 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -17,7 +17,7 @@ machine_type: # # [target1] [target2] [target3] [target4] [target5] # [machine] qemuarm64 qemux86 qemuarm qemux86-64 qemuarm64 -# [yocto] kirkstone honister master dunfell master +# [yocto] kirkstone langdale master dunfell master # [X11] no no yes yes no # [mingw] no yes no no no # [static] no no no no yes @@ -47,10 +47,10 @@ target2: &target2 variableValue: qemux86 - type: EnvironmentVariable variableName: MANIFEST - variableValue: honister.xml + variableValue: langdale.xml - type: EnvironmentVariable variableName: TEST_CONFIGS - variableValue: ci configs pre-inclusive wayland mingw no-webengine + variableValue: ci configs post-inclusive wayland mingw no-webengine enable_if: condition: property property: target.arch