Bladeren bron

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 <[email protected]>
Christian Marangi 2 jaren geleden
bovenliggende
commit
1fa84354a9
2 gewijzigde bestanden met toevoegingen van 4 en 4 verwijderingen
  1. 2 2
      .github/workflows/label-kernel.yml
  2. 2 2
      .github/workflows/label-target.yml

+ 2 - 2
.github/workflows/label-kernel.yml

@@ -21,8 +21,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"/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:
   build_kernel:
     name: Build Kernel with external toolchain
     name: Build Kernel with external toolchain

+ 2 - 2
.github/workflows/label-target.yml

@@ -21,8 +21,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"/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:
   build_target:
     name: Build target
     name: Build target