RepoMirrors
/
openwrt
mirror of git://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CI: use split target and subtarget in label workflow 

With eecc6e4811 ("CI: rework build workflow to have split target and
subtarget directly") target and subtarget are split in 2 different
variables. Label workflow were not aligned to this change and are
currently broken.

Fix them and correctly pass split target and subtarget.

Fixes: eecc6e4811 ("CI: rework build workflow to have split target and subtarget directly")
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2023-05-25 18:24:00 +02:00
parent f5a5ce8822
commit bf8187d5dc
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/label-kernel.yml vendored
View File

@ -20,7 +20,8 @@ jobs:
env: env:
CI_EVENT_LABEL_NAME: ${{ github.event.label.name }} CI_EVENT_LABEL_NAME: ${{ github.event.label.name }}
run: | run: |
echo "$CI_EVENT_LABEL_NAME" | sed -n 's/.*:\(.*\):\(.*\)$/target="\1\/\2"/p' | tee --append $GITHUB_OUTPUT echo "$CI_EVENT_LABEL_NAME" | sed -n 's/.*:\(.*\):\(.*\)$/target="\1"/p' | tee --append $GITHUB_OUTPUT
echo "$CI_EVENT_LABEL_NAME" | sed -n 's/.*:\(.*\):\(.*\)$/subtarget="\2"/p' | tee --append $GITHUB_OUTPUT
build_kernel: build_kernel:
name: Build Kernel with external toolchain name: Build Kernel with external toolchain
@ -31,6 +32,7 @@ jobs:
uses: ./.github/workflows/build.yml uses: ./.github/workflows/build.yml
with: with:
target: ${{ needs.set_target.outputs.target }} target: ${{ needs.set_target.outputs.target }}
subtarget: ${{ needs.set_target.outputs.subtarget }}
build_kernel: true build_kernel: true
build_all_kmods: true build_all_kmods: true
@ -43,3 +45,4 @@ jobs:
uses: ./.github/workflows/check-kernel-patches.yml uses: ./.github/workflows/check-kernel-patches.yml
with: with:
target: ${{ needs.set_target.outputs.target }} target: ${{ needs.set_target.outputs.target }}
subtarget: ${{ needs.set_target.outputs.subtarget }}

4
.github/workflows/label-target.yml vendored
View File

@ -20,7 +20,8 @@ jobs:
env: env:
CI_EVENT_LABEL_NAME: ${{ github.event.label.name }} CI_EVENT_LABEL_NAME: ${{ github.event.label.name }}
run: | run: |
echo "$CI_EVENT_LABEL_NAME" | sed -n 's/.*:\(.*\):\(.*\)$/target="\1\/\2"/p' | tee --append $GITHUB_OUTPUT echo "$CI_EVENT_LABEL_NAME" | sed -n 's/.*:\(.*\):\(.*\)$/target="\1"/p' | tee --append $GITHUB_OUTPUT
echo "$CI_EVENT_LABEL_NAME" | sed -n 's/.*:\(.*\):\(.*\)$/subtarget="\2"/p' | tee --append $GITHUB_OUTPUT
build_target: build_target:
name: Build target name: Build target
@ -31,6 +32,7 @@ jobs:
uses: ./.github/workflows/build.yml uses: ./.github/workflows/build.yml
with: with:
target: ${{ needs.set_target.outputs.target }} target: ${{ needs.set_target.outputs.target }}
subtarget: ${{ needs.set_target.outputs.subtarget }}
build_full: true build_full: true
build_all_kmods: true build_all_kmods: true
build_all_boards: true build_all_boards: true