From: Christian Marangi <ansuelsmth@gmail.com>
Date: Thu, 25 May 2023 16:24:00 +0000 (+0200)
Subject: CI: use split target and subtarget in label workflow
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7666503f68c736970c89779ad3dc77e3573e5b11;p=openwrt%2Fstaging%2Fblocktrron.git

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)
---

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