Merge pull request #23662 from LaurelineP/core/update-prereview

Update workflow

Author: LaurelineP

.github/workflows/pre-review.yml

@@ -33,7 +33,7 @@ jobs:
           python-version: 3.9
 
 
-      - name: Fecth branch
+      - name: Fetch branch
         run: git fetch origin ${{ github.event.pull_request.base.ref }}
 
       - name: Collect information
@@ -64,49 +64,50 @@ jobs:
       - name: Run "preReview" script
         run: |
           PR_NUMBER=${{ github.event.pull_request.number }}
+          BASE_REPO=${{ github.event.pull_request.base.repo.full_name }}
           REVIEW_MESSAGE=$(python pre_review.py "$CHANGED_FILES" "$CONTRIBUTOR")
           echo "REVIEW_MESSAGE<<EOF" >> $GITHUB_ENV
           echo "$REVIEW_MESSAGE" >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
 
-          # Save to env
-          echo "REVIEW_MESSAGE<<EOF" >> $GITHUB_ENV
-          echo "$REVIEW_MESSAGE" >> $GITHUB_ENV
-          echo "EOF" >> $GITHUB_ENV
-          
-          # Print to log explicitly
           echo "===== REVIEW_MESSAGE ====="
           echo "$REVIEW_MESSAGE"
-          echo "=========================="
+          echo "==========================="
           
           # Attempt to comment (will skip for forks)
-          gh pr comment "$PR_NUMBER" --body "$REVIEW_MESSAGE" -R "${{ github.event.pull_request.base.repo.full_name }}"
-
-          # Assign invalid label
-          if echo "$REVIEW_MESSAGE" | grep -Eqi 'Missing required contribution:|Incorrect changes:'; then
-              gh pr edit "$PR_NUMBER" --add-label "invalid" -R "$BASE_REPO"
+          gh pr comment "$PR_NUMBER" --body "$REVIEW_MESSAGE" -R "$BASE_REPO"
+
+          # --------------------------------------------------------------------------
+          #                                   LABELS                                   
+          # --------------------------------------------------------------------------
+          # --- "Changes Requested" or "Awaiting Maintainer Validation" labels ---
+          if echo "$REVIEW_MESSAGE" | grep -Eq '\- \[ \]'; then
+            gh pr edit "$PR_NUMBER" --add-label "Changes Requested" -R "$BASE_REPO"
+            gh pr edit "$PR_NUMBER" --remove-label "Awaiting Maintainer Validation" -R "$BASE_REPO"
           else
-              gh pr edit "$PR_NUMBER" --remove-label "invalid" -R "$BASE_REPO"
+            gh pr edit "$PR_NUMBER" --add-label "Awaiting Maintainer Validation" -R "$BASE_REPO"
+            gh pr edit "$PR_NUMBER" --remove-label "Changes Requested" -R "$BASE_REPO"
           fi
 
-          # Assign changes requested label
-          if echo "$REVIEW_MESSAGE" | grep -Eqi 'Contributors.md'; then
-              gh pr edit "$PR_NUMBER" --add-label "changes requested" -R "$BASE_REPO"
+
+          # --- Invalid label ---
+          if echo "$REVIEW_MESSAGE" | grep -qi 'Missing required contribution'; then
+            gh pr edit "$PR_NUMBER" --add-label "invalid" -R "$BASE_REPO"
           else
-              gh pr edit "$PR_NUMBER" --remove-label "changes requested" -R "$BASE_REPO"
+            gh pr edit "$PR_NUMBER" --remove-label "invalid" -R "$BASE_REPO"
           fi
 
-          # Assign Awaiting Maintainer Validation if there are checkboxes
-          if echo "$REVIEW_MESSAGE" | grep -q '\- \[ \]'; then
-              gh pr edit "$PR_NUMBER" --add-label "Awaiting Maintainer Validation" -R "$BASE_REPO"
+
+          # --- Conflict present label ---
+          if echo "$REVIEW_MESSAGE" | grep -qi 'archived'; then
+            gh pr edit "$PR_NUMBER" --add-label "Conflict present" -R "$BASE_REPO"
           else
-              gh pr edit "$PR_NUMBER" --remove-label "Awaiting Maintainer Validation" -R "$BASE_REPO"
+            gh pr edit "$PR_NUMBER" --remove-label "Conflict present" -R "$BASE_REPO"
           fi
 
         env:
           CHANGED_FILES: ${{ env.CHANGED_FILES }}
           CONTRIBUTOR: ${{ env.CONTRIBUTOR }}
-          PR_NUMBERS: ${{ env.GITHUB_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   remove-awaiting-on-merge:

pre_review.py

@@ -159,7 +159,7 @@ def review_contributors_file( changed_files, contributor ):
 
     if reviews:
         reviews = [
-            '## `Contributors.md` addition feedback',
+            '## `CONTRIBUTORS.md` addition feedback',
             '> [!TIP]',
             '> Check how others set their links to adjust yours if needed',
             *reviews