[openwrt/openwrt] CI: don't add "" in target and subtarget for label workflow

LEDE Commits lede-commits at lists.infradead.org
Sat May 27 10:59:52 PDT 2023


ansuel pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/4174768d9f764faccae376723dbac132b2c11fe9

commit 4174768d9f764faccae376723dbac132b2c11fe9
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Sat May 27 19:53:15 2023 +0200

    CI: don't add "" in target and subtarget for label workflow
    
    Don't add "" in target and subtarget for label workflow from label
    detection as it does cause problem in build workflow on container
    target/subtarget matching.
    
    Fixes: bf8187d5dc4d ("CI: use split target and subtarget in label workflow")
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
    (cherry picked from commit 1fa84354a963eb71eca9e67a1fc7f99a53016a5c)
---
 .github/workflows/label-kernel.yml | 4 ++--
 .github/workflows/label-target.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/label-kernel.yml b/.github/workflows/label-kernel.yml
index 243d285e28..e5ca945a64 100644
--- a/.github/workflows/label-kernel.yml
+++ b/.github/workflows/label-kernel.yml
@@ -21,8 +21,8 @@ jobs:
         env:
           CI_EVENT_LABEL_NAME: ${{ github.event.label.name }}
         run: |
-          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
+          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
diff --git a/.github/workflows/label-target.yml b/.github/workflows/label-target.yml
index 3a624598b1..157e8caaad 100644
--- a/.github/workflows/label-target.yml
+++ b/.github/workflows/label-target.yml
@@ -21,8 +21,8 @@ jobs:
         env:
           CI_EVENT_LABEL_NAME: ${{ github.event.label.name }}
         run: |
-          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
+          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




More information about the lede-commits mailing list