From c39efe018bec83b2a72b6f1f506b710259c87809 Mon Sep 17 00:00:00 2001 From: Jeremias Peier Date: Mon, 28 Oct 2024 16:36:57 +0100 Subject: [PATCH] Revert "build: filter labels before cherry picking (#3185)" This reverts commit 772e8992ac97ec21449197931c398d0f3a7ba2b5. --- .github/workflows/maintenance-cherry-pick.yml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/maintenance-cherry-pick.yml b/.github/workflows/maintenance-cherry-pick.yml index f95f2f586d..dd70871be7 100644 --- a/.github/workflows/maintenance-cherry-pick.yml +++ b/.github/workflows/maintenance-cherry-pick.yml @@ -20,20 +20,8 @@ jobs: steps: - run: echo Labels are not empty, continuing - filter_labels: - needs: [check_labels] - runs-on: ubuntu-latest - outputs: - filtered_labels: ${{ steps.filter.outputs.filtered_labels }} - steps: - - name: Filter labels - id: filter - run: | - FILTERED_LABELS=$(jq -r '.pull_request.labels | map(select(.name | test("^target: [0-9]+\\.x$"))) | .[].name' <<< "${{ toJSON(github.event) }}") - echo "filtered_labels=${FILTERED_LABELS}" >> $GITHUB_OUTPUT - cherry_pick: - needs: [filter_labels] + needs: [check_labels] runs-on: ubuntu-latest if: github.event.pull_request.merged == true && github.event.pull_request.user.login != 'renovate[bot]' @@ -41,7 +29,7 @@ jobs: failed_branches: ${{ steps.update_failed_branches.outputs.failed_branches }} strategy: matrix: - label: ${{ fromJson(needs.filter_labels.outputs.filtered_labels) }} + label: ${{ github.event.pull_request.labels.*.name }} steps: - name: Get token