some-test-deploy-squash.yml

name: Trigger Production Deploy Squash

on:
  workflow_dispatch:

jobs:
  merge-master-to-prod:
    name: Squash Master into Prod
    runs-on: ubuntu-latest

    permissions:
      contents: write
      actions: write

    steps:
      - name: Checkout prod branch
        uses: actions/checkout@v3
        with:
          fetch-depth: 0
          ref: prod
          token: ${{ secrets.SECRET }}

      - name: Configure Git
        run: |
          git config user.name "github-actions[bot]"
          git config user.email "github-actions[bot]@users.noreply.github.com"

      - name: Fetch master branch
        run: git fetch origin master

      - name: Squash changes from master into prod
        run: |
          git merge --squash origin/master -Xtheirs

          last_squash_commit=$(git log origin/prod --grep="Production Deploy:" -1 --pretty=format:"%B" \
            | grep -oP '(?<=→ )\b[0-9a-f]{7,40}\b' \
            | head -n1)
            
          if [ -n "$last_squash_commit" ]; then
            commit_count=$(git rev-list "$last_squash_commit"..origin/master --count)
            first_commit=$(git rev-list "$last_squash_commit"..origin/master | tail -n1 | cut -c1-7)
            commit_range="$last_squash_commit..origin/master"
          else
            commit_count=$(git rev-list origin/master --count)
            first_commit=$(git rev-list origin/master | tail -n1 | cut -c1-7)
            commit_range="origin/master"
          fi

          last_commit=$(git rev-list origin/master | head -n1 | cut -c1-7)

          {
            echo "Production Deploy: $commit_count commits ($first_commit → $last_commit)"
            echo
            echo "Included commits:"

            git log "$commit_range" --pretty=format:"- %h %s"
          } > /tmp/commitmsg

          # 5) Create the single squash commit
          git commit -F /tmp/commitmsg

      - name: Push new squash commit to prod
        run: |
          git push origin prod --force-with-lease