try again

edenartlab · Jan 3, 2025 · 880a914 · 880a914
1 parent 4c2c4c1
commit 880a914
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/prod.yaml b/.github/workflows/prod.yaml
@@ -11,7 +11,9 @@ on:
 
 jobs:
   deploy:
-    if: github.event.pull_request.merged == true || github.event_name == 'push'
+    if: >
+      (github.event_name == 'push' && !contains(github.event.head_commit.message, 'Merge pull request')) ||
+      (github.event_name == 'pull_request' && github.event.pull_request.merged == true)
     runs-on: ubuntu-latest
     env:
       DB: PROD
@@ -34,7 +36,6 @@ jobs:
       - name: Install Rye
         run: |
           curl -sSf https://rye.astral.sh/get | bash
-          echo "$HOME/.rye/shims" >> $GITHUB_PATH
 
       - name: Install dependencies
         run: rye sync

diff --git a/.github/workflows/staging.yaml b/.github/workflows/staging.yaml
@@ -11,7 +11,9 @@ on:
 
 jobs:
   deploy:
-    if: github.event.pull_request.merged == true || github.event_name == 'push'
+    if: >
+      (github.event_name == 'push' && !contains(github.event.head_commit.message, 'Merge pull request')) ||
+      (github.event_name == 'pull_request' && github.event.pull_request.merged == true)
     runs-on: ubuntu-latest
     env:
       DB: STAGE
@@ -34,7 +36,6 @@ jobs:
       - name: Install Rye
         run: |
           curl -sSf https://rye.astral.sh/get | bash
-          echo "$HOME/.rye/shims" >> $GITHUB_PATH
 
       - name: Install dependencies
         run: rye sync