new setp

lilblueyes · lilblueyes · commit 849098f5de4f · 2025-09-09T13:45:54.000+02:00
diff --git a/.github/steps/4-step.md b/.github/steps/4-step.md
@@ -6,33 +6,24 @@
 Un conflit arrive quand la même portion de code a été modifiée différemment sur `main` et sur ta branche. Git ne sait pas quelle version garder, il te demande de trancher.
 
 ### ✅ Cas simple, pas de conflit
-- Le message GitHub « **This branch has no conflicts with the base branch** » (ou équivalent en FR) signifie que tu peux **fusionner** directement.
+- Le message GitHub « **This branch has no conflicts with the base branch** » signifie que tu peux **fusionner** directement.
 - Clique **Merge pull request** puis **Confirm merge**.
 
 ### ⚠️ S’il y a des conflits
 Choisis **une** des deux méthodes :
 
-**A. Bouton GitHub (UI)**
-1. Clique **Update branch** dans la PR (s’il est proposé).
-2. Si des conflits persistent, clique **Resolve conflicts**, édite les fichiers, puis **Mark as resolved** → **Commit merge**.
+**A. Bouton GitHub, UI**
+1. Clique **Update branch** dans la PR, si proposé.
+2. Si des conflits persistent, clique **Resolve conflicts**, édite, **Mark as resolved**, puis **Commit merge**.
 
-**B. En ligne de commande (rebase recommandé)**
+**B. Ligne de commande, rebase recommandé**
 ```bash
-# Mets à jour ton dépôt local
 git fetch origin
-
-# Va sur ta branche de la PR
 git checkout my-first-branch
-
-# Rebase sur main
 git rebase origin/main
 
-# Ouvre les fichiers en conflit, supprime les marqueurs <<<<<<< ======= >>>>>>>
-# puis valide les résolutions :
+# Résous les conflits, supprime les marqueurs <<<<<<< ======= >>>>>>>
 git add .
-
-# Continue le rebase
 git rebase --continue
 
-# Pousse le résultat (forcé sécurisé)
 git push --force-with-lease
diff --git a/.github/workflows/3-last-step.yml b/.github/workflows/3-last-step.yml
@@ -2,7 +2,7 @@ name: Step 3 # Last step of the exercise
 
 on:
   pull_request:
-    types: [opened, reopened, closed]
+    types: [opened, reopened, synchronize, closed]
   workflow_dispatch:
 
 permissions:
@@ -13,51 +13,69 @@ permissions:
 
 env:
   REVIEW_FILE: ".github/steps/x-review.md"
+  STEP_4_FILE: ".github/steps/4-step.md"
 
 jobs:
   find_exercise:
     name: Find Exercise Issue
     uses: skills/exercise-toolkit/.github/workflows/find-exercise-issue.yml@v0.7.1
 
-  on-opened:
-    if: ${{ github.event_name == 'pull_request' && (github.event.action == 'opened' || github.event.action == 'reopened') }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Comment on the PR
-        uses: GrantBirki/comment@v2.1.1
-        with:
-          repository: ${{ github.repository }}
-          issue-number: ${{ github.event.pull_request.number }}
-          file: .github/steps/3-step.md
-
-  post_review_content:
-    name: Post review content
+  # À l'ouverture ou mise à jour de la PR, on affiche l'Étape 4 (merge)
+  step4_merge_guidance:
+    name: Step 4, merge guidance
     needs: [find_exercise]
-    if: ${{ github.event_name == 'pull_request' && (github.event.action == 'opened' || github.event.action == 'reopened') }}
+    if: ${{ github.event_name == 'pull_request' && (github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'synchronize') }}
     runs-on: ubuntu-latest
     env:
       ISSUE_REPOSITORY: ${{ github.repository }}
       ISSUE_NUMBER: ${{ needs.find_exercise.outputs.issue-number }}
-
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Create comment, step finished, final review next
-        uses: GrantBirki/comment@v2.1.1
+      - name: Detect PR mergeability
+        id: prinfo
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const { owner, repo } = context.repo;
+            const number = context.payload.pull_request.number;
+            const { data: pr } = await github.rest.pulls.get({ owner, repo, pull_number: number });
+            core.setOutput('mergeable_state', pr.mergeable_state || 'unknown');
+
+      - name: Build status line
+        id: status
+        run: |
+          state='${{ steps.prinfo.outputs.mergeable_state }}'
+          if [ "$state" = "clean" ] || [ "$state" = "unstable" ] || [ "$state" = "blocked" ]; then
+            echo "line=✅ Pas de conflit bloquant détecté, tu peux **fusionner** ta PR" >> $GITHUB_OUTPUT
+          elif [ "$state" = "dirty" ]; then
+            echo "line=⚠️ Conflits détectés, suis les étapes ci-dessous pour les résoudre" >> $GITHUB_OUTPUT
+          else
+            echo "line=ℹ️ État de fusion inconnu pour le moment, suis le guide ci-dessous si GitHub indique des conflits" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Find existing Step 4 comment
+        id: find
+        uses: peter-evans/find-comment@v3
         with:
           repository: ${{ env.ISSUE_REPOSITORY }}
           issue-number: ${{ env.ISSUE_NUMBER }}
-          file: .github/i18n/fr/lesson-review.md
+          comment-author: github-actions[bot]
+          body-includes: "## Étape 4, résoudre les conflits et fusionner"
 
-      - name: Create comment, add review content
+      - name: Create or update Step 4 comment
         uses: GrantBirki/comment@v2.1.1
         with:
           repository: ${{ env.ISSUE_REPOSITORY }}
           issue-number: ${{ env.ISSUE_NUMBER }}
-          file: ${{ env.REVIEW_FILE }}
+          file: ${{ env.STEP_4_FILE }}
+          edit-mode: ${{ steps.find.outputs.comment-id && 'replace' || 'append' }}
+          comment-id: ${{ steps.find.outputs.comment-id }}
+          vars: |
+            status_line: ${{ steps.status.outputs.line }}
 
+  # À la fermeture mergée, on finalise
   finish_exercise:
     name: Finish Exercise
     needs: [find_exercise]
@@ -75,7 +93,6 @@ jobs:
     runs-on: ubuntu-latest
     env:
       ISSUE_NUMBER: ${{ needs.find_exercise.outputs.issue-number }}
-
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -92,13 +109,11 @@ jobs:
             const {owner, repo} = context.repo;
             const login = context.actor;
             const repoUrl = `https://github.com/${owner}/${repo}`;
-
             const text = `Je viens de terminer l’exercice "GitHub Basics" ! 🎉\n\n${repoUrl}\n\n#GitHubSkills #OpenSource #GitHubLearn`;
             const enc = encodeURIComponent(text);
             const shareX = `https://twitter.com/intent/tweet?text=${enc}`;
             const shareBsky = `https://bsky.app/intent/compose?text=${enc}`;
             const shareLinkedIn = `https://www.linkedin.com/feed/?shareActive=true&text=${enc}`;
-
             const lines = [
               '<div align="center">',
               '',
@@ -137,7 +152,6 @@ jobs:
               ''
             ];
             const block = lines.join('\n');
-
             const readmePath = path.join(process.env.GITHUB_WORKSPACE, 'README.md');
             const current = fs.existsSync(readmePath) ? fs.readFileSync(readmePath, 'utf8') : '';
             fs.writeFileSync(readmePath, block + current, 'utf8');
@@ -161,43 +175,40 @@ jobs:
           git pull --rebase origin main || true
           git push origin HEAD:main
 
-      - name: Replace final EN comment with FR
-        uses: actions/github-script@v7
-        env:
-          ISSUE_NUMBER: ${{ env.ISSUE_NUMBER }}
+  post_review_content:
+    name: Post review content, after merge
+    needs: [find_exercise, finalize_fr]
+    if: ${{ github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true }}
+    runs-on: ubuntu-latest
+    env:
+      ISSUE_REPOSITORY: ${{ github.repository }}
+      ISSUE_NUMBER: ${{ needs.find_exercise.outputs.issue-number }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Create comment, step finished, final review next
+        uses: GrantBirki/comment@v2.1.1
         with:
-          script: |
-            const {owner, repo} = context.repo;
-            const issue_number = Number(process.env.ISSUE_NUMBER);
-            const body = [
-              `🎉 Félicitations @${context.actor} tu as terminé l’exercice **GitHub Basics**.`,
-              `Le README a été mis à jour avec un message final en français.`,
-              `➡️ Retourne à la page d’accueil du dépôt pour voir le résultat.`
-            ].join('\n\n');
-
-            const { data: comments } = await github.rest.issues.listComments({
-              owner, repo, issue_number, per_page: 100, sort: 'created', direction: 'desc'
-            });
-
-            const target = comments.find(c =>
-              c.user?.login === 'github-actions[bot]' &&
-              /Congratulations|You finished the exercise/i.test(c.body || '')
-            );
-
-            if (target) {
-              await github.rest.issues.updateComment({ owner, repo, comment_id: target.id, body });
-            } else {
-              await github.rest.issues.createComment({ owner, repo, issue_number, body });
-            }
+          repository: ${{ env.ISSUE_REPOSITORY }}
+          issue-number: ${{ env.ISSUE_NUMBER }}
+          file: .github/i18n/fr/lesson-review.md
+
+      - name: Create comment, add review content
+        uses: GrantBirki/comment@v2.1.1
+        with:
+          repository: ${{ env.ISSUE_REPOSITORY }}
+          issue-number: ${{ env.ISSUE_NUMBER }}
+          file: ${{ env.REVIEW_FILE }}
 
   disable_step3:
     name: Disable Step 3
-    needs: [finalize_fr]
+    needs: [post_review_content]
     if: ${{ github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true }}
     runs-on: ubuntu-latest
     steps:
       - name: Disable workflow file
         run: gh workflow disable ".github/workflows/3-last-step.yml"
         env:
           GH_TOKEN: ${{ github.token }}
-        continue-on-error: true
+        continue-on-error: true
diff --git a/.github/workflows/4-step.yml b/.github/workflows/4-step.yml
