From f64aa345077f247c53bb7dbba0ad22205699a7fe Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Wed, 15 Jan 2025 02:43:09 -0500 Subject: [PATCH 1/2] removed wrong input argument --- .github/workflows/backport.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index f5da165450..95a1e0166d 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -34,4 +34,3 @@ jobs: copy_requested_reviewers: true label_pattern: to-be-backported target_branches: ${{ env.OLD_BRANCH }} - conflict_resolution: draft_commit_conflicts From 0ddc15c486eb0ef33084083c49c532f10a87f68c Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Wed, 15 Jan 2025 02:52:52 -0500 Subject: [PATCH 2/2] fix label_pattern usage --- .github/workflows/backport.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 95a1e0166d..a1013c7728 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -14,7 +14,8 @@ jobs: backport: name: Backport pull request if: ${{ github.repository_owner == 'nvidia' && - github.event.pull_request.merged == true + github.event.pull_request.merged == true && + contains( github.event.pull_request.labels.*.name, 'to-be-backported') }} runs-on: ubuntu-latest steps: @@ -32,5 +33,4 @@ jobs: copy_assignees: true copy_labels_pattern: true copy_requested_reviewers: true - label_pattern: to-be-backported target_branches: ${{ env.OLD_BRANCH }}