diff --git a/.github/workflows/add-backport-label.yml b/.github/workflows/add-backport-label.yml index 331cbfc..89eca19 100644 --- a/.github/workflows/add-backport-label.yml +++ b/.github/workflows/add-backport-label.yml @@ -12,4 +12,3 @@ jobs: - uses: actions-ecosystem/action-add-labels@v1 with: labels: backport 2.x - diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 9cbd4c7..c9d02da 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -7,7 +7,15 @@ on: jobs: backport: - if: ${{ contains(github.event.label.name, 'backport') }} + if: > + github.event.pull_request.merged + && ( + github.event.action == 'closed' + || ( + github.event.action == 'labeled' + && contains(github.event.label.name, 'backport') + ) + ) runs-on: ubuntu-latest permissions: contents: write