Merge branch 'main' into feature/adding_notifiers_blocks

roboflow · Nov 29, 2024 · a776146 · a776146
2 parents c2f64a4 + 0bc541c
commit a776146
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.github/workflows/check_if_branch_is_mergeable.yml b/.github/workflows/check_if_branch_is_mergeable.yml
@@ -30,6 +30,10 @@ jobs:
       - name: Check and store mergable state
         id: mergeable_check
         run: |
+          if [ -z "${{ github.event.pull_request.head.sha }}" ]; then
+            echo "Merging to main";
+            exit 0;
+          fi
           echo "Check if main is ancestor of ${{ github.event.pull_request.head.sha }} (branch HEAD)";
           if $(git merge-base --is-ancestor ${{ env.main_sha }} ${{ github.event.pull_request.head.sha }}); then
             echo "Branch is mergeable";