Extract workflows for merge conflicts + issue done - Extract merge conflicts check to its own workflow, plus make it run on push - Add issues update as Done or Done staging based on extracted commit messages

5743972a26bf12bb6f9c6df3f1e8f28bd0522c94

Wolfsblvt <wolfsblvt@gmail.com>

Parents: d9c868b2fed57e8f32a6c8596368801a54f2cf9c

.github/workflows/issues-updates-on-merge.yml+39 -0 Viewed

 +name: 🎯 Update Issues on Push
++
 +on:
 +  push:
 +    branches:
 +      - staging
 +      - release
++
 +jobs:
 +  # This runs commits to staging/release, reading the commit messages. Check `pr-auto-manager.yml`:`update-linked-issues` for PR-linked updates.
 +  update-linked-issues:
 +    name: Update Issues on Push
 +    runs-on: ubuntu-latest
++
 +    steps:
 +      - name: Checkout Repository
 +        # Checkout
 +        # https://github.com/marketplace/actions/checkout
 +        uses: actions/checkout@v4
++
 +      - name: Extract Linked Issues from Commit Message
 +        id: extract_issues
 +        run: |
 +          ISSUES=$(git log -1 --pretty=%B | grep -oiE '(close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved) #([0-9]+)' | awk '{print $2}' | tr -d '#' | jq -R -s -c 'split("\n")[:-1]')
 +          echo "issues=$ISSUES" >> $GITHUB_ENV
++
 +      - name: Label Linked Issues
 +        id: label_linked_issues
 +        env:
 +          GH_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
 +        run: |
 +          for ISSUE in $(echo $issues | jq -r '.[]'); do
 +            echo "Updating issue #$ISSUE"
 +            if [ "${{ github.ref }}" == "refs/heads/staging" ]; then
 +              gh issue edit $ISSUE -R ${{ github.repository }} --add-label "✅ Done (staging)"
 +            elif [ "${{ github.ref }}" == "refs/heads/release" ]; then
 +              gh issue edit $ISSUE -R ${{ github.repository }} --add-label "✅ Done"
 +            fi
 +          done

.github/workflows/pr-auto-manager.yml+8 -19 Viewed

     types: [created]
 jobs:
 -  check-merge-conflicts:
 -    name: Check Merge Conflicts
 -    runs-on: ubuntu-latest
+-
 -    steps:
 -      - name: Check Merge Conflicts
 -        # Label Conflicting Pull Requests
 -        # https://github.com/marketplace/actions/label-conflicting-pull-requests
 -        uses: eps1lon/actions-label-merge-conflict@v3
 -        with:
 -          dirtyLabel: '🚫 Merge Conflicts'
 -          repoToken: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
 -          commentOnDirty: >
 -            ⚠️ This PR has conflicts that need to be resolved before it can be merged.
+-
   label-by-size:
     name: Apply Label for PR Size
     runs-on: ubuntu-latest

   check-merge-blocking-labels:
     name: Check Merge Blocking Labels
     needs: [checklabel-mergeby-conflictsbranches, label-by-branchesfiles]
     runs-on: ubuntu-latest
 +    # Run, even if the previous jobs were skipped/failed
 +    if: always()
     steps:
       - name: Check Merge Blocking

           script: |
             const prLabels = context.payload.pull_request.labels.map(label => label.name);
             const blockingLabels = [
 -              "🚫 Merge Conflicts",
               "⛔ Don't Merge",
               "🔨 Needs Work",
               "🔬 Needs Testing",

   write-auto-comments:
     name: Post PR Comments Based on Labels
     needs: [check-merge-conflicts, label-by-size, label-by-branches, label-by-files, remove-stale-label]
     runs-on: ubuntu-latest
 +    # Run, even if the previous jobs were skipped/failed
 +    if: always()
     steps:
       - name: Checkout Repository

           config_file: .github/pr-auto-comments.yml
           github_token: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
 +  # This runs on merged PRs to staging, reading the PR body and directly linked issues. Check `issues-updates-on-merge.yml`:`update-linked-issues` for commit-based updates.
   update-linked-issues:
     name: Update Issues on Staging Merge
     runs-on: ubuntu-latest
     if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'staging'
     steps:
       - name: Extract Linked Issues From PR Description
         id: extract_issues
         run: |
             ISSUES=$(jq -r '.pull_request.body' "$GITHUB_EVENT_PATH" | grep -oiE '(close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved) #([0-9]+)' | awk '{print $2}' | tr -d '#' | jq -R -s -c 'split("\n")[:-1]')

.github/workflows/pr-check-merge-conflicts.yaml+24 -0 Viewed

 +name: 🎯 Push Handler
++
 +on:
 +  # So that PRs touching the same files as the push are updated
 +  push:
 +  # So that the `dirtyLabel` is removed if conflicts are resolved
 +  pull_request_target:
 +    types: [synchronize]
++
 +jobs:
 +  check-merge-conflicts:
 +    name: Check Merge Conflicts
 +    runs-on: ubuntu-latest
++
 +    steps:
 +      - name: Check Merge Conflicts
 +        # Label Conflicting Pull Requests
 +        # https://github.com/marketplace/actions/label-conflicting-pull-requests
 +        uses: eps1lon/actions-label-merge-conflict@v3
 +        with:
 +          dirtyLabel: '🚫 Merge Conflicts'
 +          repoToken: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
 +          commentOnDirty: >
 +            ⚠️ This PR has conflicts that need to be resolved before it can be merged.