diff options
| author | Christian Marangi <ansuelsmth@gmail.com> | 2023-05-25 18:24:00 +0200 |
|---|---|---|
| committer | Christian Marangi <ansuelsmth@gmail.com> | 2023-05-25 23:15:26 +0200 |
| commit | 7666503f68c736970c89779ad3dc77e3573e5b11 (patch) | |
| tree | 54743bfc07e59b3bade4a2ee94ab461ae79973a4 /.github | |
| parent | 8f2dcd0c3d29ec0e4983d9a96b26a30c226da7a1 (diff) | |
| download | upstream-7666503f68c736970c89779ad3dc77e3573e5b11.tar.gz upstream-7666503f68c736970c89779ad3dc77e3573e5b11.tar.bz2 upstream-7666503f68c736970c89779ad3dc77e3573e5b11.zip | |
CI: use split target and subtarget in label workflow
With eecc6e48117b ("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: eecc6e48117b ("CI: rework build workflow to have split target and subtarget directly")
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
(cherry picked from commit bf8187d5dc4d4bbb23770955744bca1787f32ac0)
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/label-kernel.yml | 5 | ||||
| -rw-r--r-- | .github/workflows/label-target.yml | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/.github/workflows/label-kernel.yml b/.github/workflows/label-kernel.yml index 1156e0ad98..6c79014edb 100644 --- a/.github/workflows/label-kernel.yml +++ b/.github/workflows/label-kernel.yml @@ -20,7 +20,8 @@ jobs: env: CI_EVENT_LABEL_NAME: ${{ github.event.label.name }} 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: name: Build Kernel with external toolchain @@ -31,6 +32,7 @@ jobs: uses: ./.github/workflows/build.yml with: target: ${{ needs.set_target.outputs.target }} + subtarget: ${{ needs.set_target.outputs.subtarget }} build_kernel: true build_all_kmods: true @@ -43,3 +45,4 @@ jobs: uses: ./.github/workflows/check-kernel-patches.yml with: target: ${{ needs.set_target.outputs.target }} + subtarget: ${{ needs.set_target.outputs.subtarget }} diff --git a/.github/workflows/label-target.yml b/.github/workflows/label-target.yml index e189024076..4c3df28f51 100644 --- a/.github/workflows/label-target.yml +++ b/.github/workflows/label-target.yml @@ -20,7 +20,8 @@ jobs: env: CI_EVENT_LABEL_NAME: ${{ github.event.label.name }} 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: name: Build target @@ -31,6 +32,7 @@ jobs: uses: ./.github/workflows/build.yml with: target: ${{ needs.set_target.outputs.target }} + subtarget: ${{ needs.set_target.outputs.subtarget }} build_full: true build_all_kmods: true build_all_boards: true |