From f91d12cb8f9aeabcfcf30a2cb5fe74e247ced687 Mon Sep 17 00:00:00 2001 From: Mark Chappell Date: Wed, 22 Jan 2025 09:08:36 +0100 Subject: [PATCH 1/2] Fixup patchback failure labelling --- .github/workflows/backports-check.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backports-check.yml b/.github/workflows/backports-check.yml index cfc7212ddb..a139e507c2 100644 --- a/.github/workflows/backports-check.yml +++ b/.github/workflows/backports-check.yml @@ -8,10 +8,11 @@ on: jobs: check_patchback_comment: - if: > - $ {{ github.event.issue.pull_request.merged }} == true && + if: ${{ + github.event.issue.pull_request.merged_at && github.event.comment.user.login == 'patchback' && contains(github.event.comment.body, '💔 cherry-picking failed') + }} runs-on: ubuntu-latest steps: From 02d9202216752b32dd9d73af76ee5a7c406e369c Mon Sep 17 00:00:00 2001 From: Mark Chappell Date: Wed, 22 Jan 2025 09:58:34 +0100 Subject: [PATCH 2/2] Add debugging to backport tester --- .github/workflows/backports-check.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/backports-check.yml b/.github/workflows/backports-check.yml index a139e507c2..6e7ac807c0 100644 --- a/.github/workflows/backports-check.yml +++ b/.github/workflows/backports-check.yml @@ -7,6 +7,14 @@ on: - edited jobs: + dump_context: + runs-on: ubuntu-latest + steps: + - name: Dump context + env: + EVENT_CONTEXT: ${{ toJson(github.event) }} + run: | + echo "${EVENT_CONTEXT}" check_patchback_comment: if: ${{ github.event.issue.pull_request.merged_at &&