From e5fd3a79e2b344eaa6258b585e4f9d9c705d443d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 26 Jan 2024 09:23:58 +0200 Subject: [PATCH] coin: update build targets Add 6.7 to test matrix and reshulffle the build targets. mickledore is EOL, drop it from active testing. Change-Id: Ia371a06c10b3f66956227d5d7c0357cb83097f87 Reviewed-by: Mikko Gronoff (cherry picked from commit 564f560b5086b2035325b6f1ffbdc27be8395127) Reviewed-by: Qt Cherry-pick Bot --- README.md | 27 ++++++++++++++++----------- coin/module_config.yaml | 22 +++++++++++----------- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index f0e072f..603debe 100644 --- a/README.md +++ b/README.md @@ -20,17 +20,22 @@ 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.6 | 6.5 | 6.4 | 6.3 | 6.2 | -| ---------- |:---:|:---:|:---:|:---:|:---:|:---:| -| master | x | x | x | | | | -| nanbield | x | x | x | | | | -| mickledore | x | x | x | x | | | -| langdale | c | c | c | x | | | -| kirkstone | x | x | x | x | x | x | -| honister | | c | c | c | x | x | -| hardknott | | c | c | c | c | c | -| gatesgarth | | c | c | c | c | c | -| dunfell | | x | x | x | x | x | +| Yocto \ Qt | dev | 6.7 | 6.6 | 6.5 | 6.4 | 6.3 | 6.2 | +|:---------- |:---:|:----:|:----:|:---:|:---:|:---:|:---:| +| scarthgap | x | x | x | x | | | | +| nanbield | x | x | x | x | | | | +| mickledore | c | c | c | c | c | | | +| langdale | c | c | c | c | c | | | +| kirkstone | x | x | x | x | c | c | x | +| honister | | | c | c | c | c | c | +| hardknott | | | c | c | c | c | c | +| gatesgarth | | | c | c | c | c | c | +| dunfell | | | x | x | c | c | x | +| | | | | | | | | +| | dev |stable|stable| LTS | EOL | EOL | LTS | + +Detailed status of supported Qt versions can be found from +https://doc.qt.io/qt-6/supported-platforms.html#supported-qt-versions Commercial Qt ------------- diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 89bf2ed..3e82471 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -16,10 +16,10 @@ machine_type: # Target build matrix: # # [target1] [target2] [target3] [target4] [target5] -# [machine] qemuarm64 qemux86 qemuarm qemux86-64 qemuarm64 -# [yocto] nanbield master mickledore master kirkstone -# [X11] no no yes yes no -# [mingw] no yes no no no +# [machine] qemuarm64 qemux86-64 qemuarm qemux86 qemuarm64 +# [yocto] master master master nanbield kirkstone +# [wayland] yes no no yes yes +# [mingw] no no no yes no # [static] no no no no yes # @@ -31,7 +31,7 @@ target1: &target1 variableValue: qemuarm64 - type: EnvironmentVariable variableName: MANIFEST - variableValue: nanbield.xml + variableValue: master.xml - type: EnvironmentVariable variableName: TEST_CONFIGS variableValue: ci configs wayland @@ -44,13 +44,13 @@ target2: &target2 instructions: - type: EnvironmentVariable variableName: MACHINE - variableValue: qemux86 + variableValue: qemux86-64 - type: EnvironmentVariable variableName: MANIFEST variableValue: master.xml - type: EnvironmentVariable variableName: TEST_CONFIGS - variableValue: ci configs wayland mingw no-webengine + variableValue: ci configs enable_if: condition: property property: target.arch @@ -63,7 +63,7 @@ target3: &target3 variableValue: qemuarm - type: EnvironmentVariable variableName: MANIFEST - variableValue: mickledore.xml + variableValue: master.xml - type: EnvironmentVariable variableName: TEST_CONFIGS variableValue: ci configs @@ -76,13 +76,13 @@ target4: &target4 instructions: - type: EnvironmentVariable variableName: MACHINE - variableValue: qemux86-64 + variableValue: qemux86 - type: EnvironmentVariable variableName: MANIFEST - variableValue: master.xml + variableValue: nanbield.xml - type: EnvironmentVariable variableName: TEST_CONFIGS - variableValue: ci configs + variableValue: ci configs wayland mingw no-webengine enable_if: condition: property property: target.arch