👷(ci) separate squash check in post-merge workflow

Author: Atheane

.github/workflows/post-merge.yml

@@ -0,0 +1,47 @@
+name: Post-merge validation
+
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  squash-check:
+    name: Check Commits Are Squashed
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Check squash merge
+        run: |
+          # Check that only one commit was added to main
+          PREVIOUS_COMMIT=$(git rev-parse HEAD~1)
+          COMMITS_ADDED=$(git rev-list --count $PREVIOUS_COMMIT..HEAD)
+
+          echo "Previous commit: $(git rev-parse --short $PREVIOUS_COMMIT)"
+          echo "Current commit: $(git rev-parse --short HEAD)"
+          echo "Commits added: $COMMITS_ADDED"
+
+          if [ $COMMITS_ADDED -ne 1 ]; then
+            echo "❌ Merge was not squashed! $COMMITS_ADDED commits were added to main"
+            echo "Please use 'Squash and merge' when merging PRs"
+            exit 1
+          fi
+
+          echo "✅ Merge was properly squashed (1 commit added)"
+
+          # Validate the commit message format
+          MESSAGE=$(git log --format=%s -n 1 HEAD)
+          echo "Merged commit message: $MESSAGE"
+
+          SCHEMA_REGEX="^(🎨|⚡️|🔥|🐛|🚑️|✨|📝|🚀|💄|🎉|✅|🔒️|🔐|🔖|🚨|🚧|💚|⬇️|⬆️|📌|👷|📈|♻️|➕|➖|🔧|🔨|🌐|✏️|💩|⏪️|🔀|📦️|👽️|🚚|📄|💥|🍱|♿️|💡|🍻|💬|🗃️|🔊|🔇|👥|🚸|🏗️|📱|🤡|🥚|🙈|📸|⚗️|🔍️|🏷️|🌱|🚩|🥅|💫|🗑️|🛂|🩹|🧐|⚰️|🧪|👔|🩺|🧱|🧑‍💻|💸|🧵|🦺|✈️)\\([a-z0-9:-]+\\) [a-z].{1,50}"
+
+          if ! echo "$MESSAGE" | grep -qE "$SCHEMA_REGEX"; then
+            echo "❌ Merged commit has invalid format: $MESSAGE"
+            echo "Required format: <emoji>(<scope>) <subject>"
+            exit 1
+          fi
+
+          echo "✅ Merged commit format is valid"

.github/workflows/ci.yml renamed to .github/workflows/pr-on-main.yml

@@ -1,4 +1,4 @@
-name: CI
+name: Pull Request Validation
 
 on:
   pull_request:
@@ -14,41 +14,34 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          ref: ${{ github.head_ref }}  # Checkout branch without merge
       - name: Check single commit and format
         run: |
-          # Check that there is only one commit in the PR
+          # Get all PR commits
           BASE_SHA=$(git merge-base origin/main HEAD)
-          git log --oneline $BASE_SHA..HEAD
-
-          COMMIT_COUNT=$(git rev-list --count $BASE_SHA..HEAD)
-          echo "Commit count: $COMMIT_COUNT"
-          if [ $COMMIT_COUNT -ne 1 ]; then
-            echo "❌ This PR contains $COMMIT_COUNT commits"
-            echo "Please squash your commits into a single commit before merging"
-            if [ $COMMIT_COUNT -gt 1 ]; then
-              echo "Use: git rebase -i HEAD~$COMMIT_COUNT"
-            fi
-            exit 1
-          fi
-
-          echo "✅ Single commit detected"
-          echo "========================="
-
-          # Get the commit message
-          MESSAGE=$(git log --format=%s -n 1 HEAD)
-          echo "Commit message: $MESSAGE"
+          COMMITS=$(git rev-list --reverse $BASE_SHA..HEAD)
+          echo "Commits in this PR:"
+          echo "$COMMITS"
 
           # Commit message schema regex
           SCHEMA_REGEX="^(🎨|⚡️|🔥|🐛|🚑️|✨|📝|🚀|💄|🎉|✅|🔒️|🔐|🔖|🚨|🚧|💚|⬇️|⬆️|📌|👷|📈|♻️|➕|➖|🔧|🔨|🌐|✏️|💩|⏪️|🔀|📦️|👽️|🚚|📄|💥|🍱|♿️|💡|🍻|💬|🗃️|🔊|🔇|👥|🚸|🏗️|📱|🤡|🥚|🙈|📸|⚗️|🔍️|🏷️|🌱|🚩|🥅|💫|🗑️|🛂|🩹|🧐|⚰️|🧪|👔|🩺|🧱|🧑‍💻|💸|🧵|🦺|✈️)\\([a-z0-9:-]+\\) [a-z].{1,50}"
 
           # Validate commit message schema
-          if ! echo "$MESSAGE" | grep -qE "$SCHEMA_REGEX"; then
-            echo "❌ Invalid commit message!"
+          INVALID_COMMITS=0
+          for commit in $COMMITS; do
+            MESSAGE=$(git log --format=%s -n 1 $commit)
+            echo "Checking commit $commit: $MESSAGE"
+
+            if ! echo "$MESSAGE" | grep -qE "$SCHEMA_REGEX"; then
+              INVALID_COMMITS=$((INVALID_COMMITS + 1))
+            fi
+          done
+
+          if [ $INVALID_COMMITS -gt 0 ]; then
+            echo "❌ $INVALID_COMMITS commit(s) with invalid format detected"
             echo "Required format: <emoji>(<scope>) <subject>"
             echo "Example: ✨(auth) add support for HTTP basic auth"
             echo "Use 'bin/cz commit' to create commits with the correct format"
             exit 1
           fi
 
-          echo "✅ Commit format is valid"
+          echo "✅ All commits have valid format"