aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Marangi <ansuelsmth@gmail.com>2023-05-27 19:53:15 +0200
committerChristian Marangi <ansuelsmth@gmail.com>2023-05-27 19:53:15 +0200
commit1fa84354a963eb71eca9e67a1fc7f99a53016a5c (patch)
treef750add8a8c302787f65f596027f261321c9a3c9
parentdc2d4d73939c3d86a8e9d968c5c3462f92771bc6 (diff)
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@gmail.com>
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