fixing release and publish jobs (#6)

tektronix · Sep 19, 2024 · 640a648 · 640a648
1 parent d2b6854
commit 640a648
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -32,7 +32,7 @@ jobs:
 
   publish:
     name: Publish
-    if: ${{ (endsWith(github.base_ref, 'main') && (contains(github.head_ref, 'release/')) && github.event.pull_request.merged ) }}
+    if: ${{ (endsWith(github.base_ref, 'main') && (contains(github.head_ref, 'release/')) || github.event.pull_request.merged ) }}
     needs:
       - package
     runs-on: ubuntu-latest
@@ -77,7 +77,7 @@ jobs:
 
   release:
     name: Release
-    if: ${{ (endsWith(github.base_ref, 'main') && (contains(github.head_ref, 'release/')) && github.event.pull_request.merged ) }}
+    if: ${{ (endsWith(github.base_ref, 'main') && (contains(github.head_ref, 'release/')) || github.event.pull_request.merged ) }}
     needs:
       - publish
     runs-on: ubuntu-latest