Update migration detection logic in workflow

openearth · Oct 2, 2024 · 61e74c4 · 61e74c4
1 parent 2b12c78
commit 61e74c4
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/.github/workflows/staging-migrations.yaml b/.github/workflows/staging-migrations.yaml
@@ -18,8 +18,12 @@ jobs:
         id: check_changes
         run: |
           if git show-ref --verify --quiet refs/remotes/origin/main; then
-            if git diff --name-only origin/main...HEAD | grep -q '^migrations/'; then
-              echo "changes=true" >> $GITHUB_ENV
+            if git merge-base --is-ancestor origin/main HEAD; then
+              if git diff --name-only origin/main...HEAD | grep -q '^migrations/'; then
+                echo "changes=true" >> $GITHUB_ENV
+              else
+                echo "changes=false" >> $GITHUB_ENV
+              fi
             else
               echo "changes=false" >> $GITHUB_ENV
             fi