From 92ac489e5f5d7efc3ae29e8901468a0b0c9ca29e Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Mon, 23 Oct 2023 13:06:49 -0400 Subject: [PATCH 1/2] Fix backport workflow Signed-off-by: Craig Perkins --- .github/workflows/backport.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 5ed1dcdc..33e61b08 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -25,4 +25,5 @@ jobs: uses: VachaShah/backport@v2.2.0 with: github_token: ${{ steps.github_app_token.outputs.token }} - branch_name: backport/backport-${{ github.event.number }} + head_template: backport/backport-<%= number %>-to-<%= base %> + failure_labels: backport-failed From aa66cc09f69f66352c8c4ff467cb300020e5769a Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Wed, 31 Jan 2024 15:23:26 -0500 Subject: [PATCH 2/2] Add condition Signed-off-by: Craig Perkins --- .github/workflows/backport.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 33e61b08..374d4d98 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -7,6 +7,7 @@ on: jobs: backport: + if: github.event.pull_request.merged == true runs-on: ubuntu-latest permissions: contents: write