WIP

Author: mydea

.github/workflows/build.yml

@@ -119,6 +119,40 @@ jobs:
         ${{ github.event_name == 'schedule' || (github.event_name == 'pull_request' &&
         contains(steps.pr-labels.outputs.labels, ' ci-skip-cache ')) }}
 
+
+  job_can_merge_into_develop:
+    name: Can Merge Into Develop
+    needs: job_get_metadata
+    runs-on: ubuntu-24.04
+    # Only run this on PRs against develop
+    if: github.event_name == 'pull_request' && github.base_ref == 'refs/heads/develop'
+    steps:
+      - name: Check out current commit
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ env.HEAD_COMMIT }}
+
+      - name: Check if master is not ahead of develop
+        run: |
+          # Get commit counts: left=develop unique commits, right=master unique commits
+          COUNTS=$(git rev-list --left-right --count origin/develop...origin/master)
+          LEFT=$(echo "$COUNTS" | cut -f1)
+          RIGHT=$(echo "$COUNTS" | cut -f2)
+
+          echo "Commits unique to develop: $LEFT"
+          echo "Commits unique to master: $RIGHT"
+
+          # Fail if master has commits that develop doesn't have (master is ahead)
+          if [ "$RIGHT" -gt 0 ]; then
+            echo "Error: master is ahead of develop by $RIGHT commits"
+            echo "Please merge master into develop or ensure master is not ahead"
+            exit 1
+          else
+            echo "✓ master is not ahead of develop"
+          fi
+
+
+
   job_build:
     name: Build
     needs: job_get_metadata
@@ -1168,6 +1202,7 @@ jobs:
         job_lint,
         job_check_format,
         job_circular_dep_check,
+        job_can_merge_into_develop,
       ]
     # Always run this, even if a dependent job failed
     if: always()