Refine logic on when to run backport workflow

Signed-off-by: Daniel Widdis <[email protected]>
opensearch-project · Jan 6, 2025 · 9a9143f · 9a9143f
1 parent c817981
commit 9a9143f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git 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
@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,4 +12,3 @@ jobs:
		- uses: actions-ecosystem/action-add-labels@v1
		with:
		labels: backport 2.x