Skip to content

Commit 93876c4

Browse files
workflows: fix distro yml include order
ci/distro.yml should come after the machine specific yml file, as it needs to replace the default distro value and target image, which is by default provided by ci/base.yml. Signed-off-by: Ricardo Salveti <[email protected]>
1 parent efc9de7 commit 93876c4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/build-yocto.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
- name: poky-altcfg
101101
yamlfile: ""
102102
- name: qcom
103-
yamlfile: 'ci/distro.yml:'
103+
yamlfile: ':ci/distro.yml'
104104
runs-on: [self-hosted, x86]
105105
name: ${{ matrix.machine }}/${{ matrix.distro.name }}
106106
steps:
@@ -121,7 +121,7 @@ jobs:
121121
mkdir $KAS_WORK_DIR
122122
${KAS_CONTAINER} dump --resolve-env --resolve-local --resolve-refs \
123123
ci/mirror.yml:ci/${{ matrix.machine }}.yml > kas-build.yml
124-
${KAS_CONTAINER} build ci/mirror.yml:${{ matrix.distro.yamlfile }}ci/${{ matrix.machine }}.yml
124+
${KAS_CONTAINER} build ci/mirror.yml:ci/${{ matrix.machine }}.yml${{ matrix.distro.yamlfile }}
125125
ci/kas-container-shell-helper.sh ci/yocto-pybootchartgui.sh
126126
mv $KAS_WORK_DIR/build/buildchart.svg .
127127

0 commit comments

Comments
 (0)