aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2021-03-22 10:10:19 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2021-04-08 09:37:37 +0300
commitac739608b4a98cae7c28657081d62f48afa12b38 (patch)
tree3d3b0f54a36bf85ce4063a34ca9742c6232b71af
parenta37b0c904d24bc32600cd4747a366a572406730d (diff)
Update CI build
Hardknott Yocto version is now available, add it to the CI builds. Only dev branch remains tested against Yocto master. Change-Id: Iec1227d616ff95b8406217f4d18ebfba80a0300a Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit c9da0eaec3fa545bf5583a27ebb15b81cd2c4f93)
-rw-r--r--README.md3
-rw-r--r--coin/module_config.yaml6
2 files changed, 5 insertions, 4 deletions
diff --git a/README.md b/README.md
index 45f77a1..9472b64 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,8 @@ Qt version.
| Yocto \ Qt | dev | 6.1 | 6.0 |
| ---------- |:---:|:---:|:---:|
-| master | x | x | x |
+| master | x | | |
+| hardknott | x | x | x |
| gatesgarth | x | x | x |
| dunfell | x | x | x |
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 35debe7..5fd370c 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] gatesgarth dunfell gatesgarth master
+# [yocto] hardknott dunfell gatesgarth hardknott
# [X11] no no yes yes
# [mingw] no yes no no
#
@@ -30,7 +30,7 @@ target1: &target1
variableValue: qemuarm64
- type: EnvironmentVariable
variableName: YOCTO_BRANCH
- variableValue: gatesgarth
+ variableValue: hardknott
- type: EnvironmentVariable
variableName: DISABLE_X11
variableValue: true
@@ -78,7 +78,7 @@ target4: &target4
variableValue: qemux86-64
- type: EnvironmentVariable
variableName: YOCTO_BRANCH
- variableValue: master
+ variableValue: hardknott
enable_if:
condition: property
property: target.arch