mlkjhgfd

lilblueyes · lilblueyes · commit ecb076fd54c4 · 2025-09-09T16:40:10.000+02:00
diff --git a/.github/workflows/2-step.yml b/.github/workflows/2-step.yml
@@ -6,6 +6,7 @@ on:
     branches: [ my-first-branch ]
     paths:
       - "playground/**"
+  # Déclencheur manuel en secours
   workflow_dispatch:
 
 permissions:
@@ -17,24 +18,34 @@ permissions:
 env:
   STEP_3_FILE: ".github/steps/3-step.md"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   find_exercise:
     name: Find Exercise Issue
     uses: skills/exercise-toolkit/.github/workflows/find-exercise-issue.yml@v0.7.1
 
-  # "Grading" pour vérifier le travail
+  # "Grading" pour vérifier le travail de l'étape 2
   check_step_work:
     name: Check step work
     runs-on: ubuntu-latest
     needs: [find_exercise]
     env:
       ISSUE_REPOSITORY: ${{ github.repository }}
       ISSUE_NUMBER: ${{ needs.find_exercise.outputs.issue-number }}
-
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Get response templates
+        uses: actions/checkout@v4
+        with:
+          repository: skills/exercise-toolkit
+          path: exercise-toolkit
+          ref: v0.7.1
+
       - name: Find last comment
         id: find-last-comment
         uses: peter-evans/find-comment@v3
@@ -49,10 +60,10 @@ jobs:
           repository: ${{ env.ISSUE_REPOSITORY }}
           issue-number: ${{ env.ISSUE_NUMBER }}
           comment-id: ${{ steps.find-last-comment.outputs.comment-id }}
-          file: .github/i18n/fr/checking-work.md
+          file: exercise-toolkit/markdown-templates/step-feedback/checking-work.md
           edit-mode: replace
 
-      # START: Checks
+      # Vérifications de l'exercice
       - name: Check if playground/README.md exists
         id: check-file-exists
         continue-on-error: true
@@ -75,28 +86,27 @@ jobs:
           issue-number: ${{ env.ISSUE_NUMBER }}
           comment-id: ${{ steps.find-last-comment.outputs.comment-id }}
           edit-mode: replace
-          file: .github/i18n/fr/step-results-table.md
+          file: exercise-toolkit/markdown-templates/step-feedback/step-results-table.md
           vars: |
             step_number: 2
             results_table:
               - description: "Vérifier que playground/README.md existe"
                 passed: ${{ steps.check-file-exists.outcome == 'success' }}
-              - description: "Chercher le mot 'Hello' dans playground/README.md"
+              - description: "Chercher 'Hello' dans playground/README.md"
                 passed: ${{ steps.check-for-keyphrase.outcome == 'success' }}
-      # END: Checks
 
       - name: Fail job if not all checks passed
         if: contains(steps.*.outcome, 'failure')
         run: exit 1
 
   post_next_step_content:
     name: Post next step content
-    needs: [find_exercise, check_step_work]
+    # Si tu veux bloquer la progression tant que les checks ne passent pas, remplace needs par: [find_exercise, check_step_work]
+    needs: [find_exercise]
     runs-on: ubuntu-latest
     env:
       ISSUE_REPOSITORY: ${{ github.repository }}
       ISSUE_NUMBER: ${{ needs.find_exercise.outputs.issue-number }}
-
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -106,7 +116,7 @@ jobs:
         with:
           repository: ${{ env.ISSUE_REPOSITORY }}
           issue-number: ${{ env.ISSUE_NUMBER }}
-          file: .github/i18n/fr/step-finished-prepare-next-step.md
+          file: exercise-toolkit/markdown-templates/step-feedback/step-finished-prepare-next-step.md
           vars: |
             next_step_number: 3
 
@@ -122,11 +132,12 @@ jobs:
         with:
           repository: ${{ env.ISSUE_REPOSITORY }}
           issue-number: ${{ env.ISSUE_NUMBER }}
-          file: .github/i18n/fr/watching-for-progress.md
+          file: exercise-toolkit/markdown-templates/step-feedback/watching-for-progress.md
 
       - name: Disable current workflow and enable next one
         run: |
-          gh workflow disable "${{ github.workflow }}"
-          gh workflow enable ".github/workflows/3-last-step.yml"
+          gh workflow disable ".github/workflows/2-step.yml"
+          gh workflow enable ".github/workflows/3-step.yml"
         env:
           GH_TOKEN: ${{ github.token }}
+        continue-on-error: true
diff --git a/.github/workflows/3-step.yml b/.github/workflows/3-step.yml
@@ -0,0 +1,79 @@
+name: Step 3
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  actions: write
+  issues: write
+  pull-requests: write
+
+env:
+  STEP_4_FILE: ".github/steps/4-step.md"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  find_exercise:
+    name: Find Exercise Issue
+    uses: skills/exercise-toolkit/.github/workflows/find-exercise-issue.yml@v0.7.1
+
+  step4_merge_guidance:
+    name: Post Step 4 (merge/conflicts) guidance
+    needs: [find_exercise]
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'pull_request' }}
+    env:
+      ISSUE_REPOSITORY: ${{ github.repository }}
+      ISSUE_NUMBER: ${{ needs.find_exercise.outputs.issue-number }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - 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 }}
+          comment-author: github-actions[bot]
+          body-includes: "## Étape 4, résoudre les conflits et fusionner"
+
+      - 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.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 }}
diff --git a/.github/workflows/4-last-step.yml b/.github/workflows/4-last-step.yml
@@ -1,8 +1,8 @@
-name: Step 3 # Last step of the exercise
+name: Step 4 # Last step of the exercise
 
 on:
   pull_request:
-    types: [opened, reopened, synchronize, closed]
+    types: [closed]
   workflow_dispatch:
 
 permissions:
@@ -13,84 +13,26 @@ 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
 
-  # 1) À l'ouverture/mise à jour de la PR, afficher 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' || 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: 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 }}
-          comment-author: github-actions[bot]
-          body-includes: "## Étape 4, résoudre les conflits et fusionner"
-
-      - 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.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 }}
-
-  # 2) Au merge, lancer le workflow de fin
   finish_exercise:
     name: Finish Exercise
     needs: [find_exercise]
-    if: ${{ github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true }}
+    if: ${{ github.event_name == 'pull_request' && github.event.pull_request.merged == true }}
     uses: skills/exercise-toolkit/.github/workflows/finish-exercise.yml@v0.7.1
     with:
       issue-url: ${{ needs.find_exercise.outputs.issue-url }}
       exercise-title: "GitHub Basics"
       update-readme-with-congratulations: false
 
-  # 3) Remplacer le commentaire "Congratulations..." par une version FR
   fr_congrats_comment:
     name: Replace official congrats with FR
     needs: [find_exercise, finish_exercise]
-    if: ${{ github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true }}
+    if: ${{ github.event_name == 'pull_request' && github.event.pull_request.merged == true }}
     runs-on: ubuntu-latest
     env:
       ISSUE_NUMBER: ${{ needs.find_exercise.outputs.issue-number }}
@@ -101,36 +43,28 @@ jobs:
           script: |
             const {owner, repo} = context.repo;
             const issue_number = Number('${{ env.ISSUE_NUMBER }}');
-
-            // Corps FR de remplacement
             const frBody = [
               `🎉 Félicitations @${context.actor} tu as terminé l’exercice **GitHub Basics**.`,
               `Le dépôt a été mis à jour pour marquer la réussite, et le README affiche un message de félicitations en français.`,
               `➡️ Retourne à la page d’accueil du dépôt pour voir le résultat.`
             ].join('\n\n');
-
-            // Cherche le dernier commentaire du bot contenant "Congratulations"
             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: frBody });
             } else {
-              // Par sécurité, si on ne trouve pas le commentaire EN on poste le FR
               await github.rest.issues.createComment({ owner, repo, issue_number, body: frBody });
             }
 
-  # 4) Mettre à jour le README avec le bloc de félicitations
   finalize_fr:
-    name: Finalize FR
+    name: Finalize FR README
     needs: [find_exercise, finish_exercise, fr_congrats_comment]
-    if: ${{ github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true }}
+    if: ${{ github.event_name == 'pull_request' && github.event.pull_request.merged == true }}
     runs-on: ubuntu-latest
     env:
       ISSUE_NUMBER: ${{ needs.find_exercise.outputs.issue-number }}
@@ -155,7 +89,6 @@ jobs:
             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">',
               '',
@@ -217,42 +150,38 @@ jobs:
           git pull --rebase origin main || true
           git push origin HEAD:main
 
-  # 5) Revue finale en FR, publiée après remplacement du message et màj du README
   post_review_content:
-    name: Post review content, after merge
+    name: Post review content (FR)
     needs: [find_exercise, fr_congrats_comment, finalize_fr]
-    if: ${{ github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true }}
+    if: ${{ github.event_name == 'pull_request' && 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
+      - name: Create comment - step finished - final review next
         uses: GrantBirki/comment@v2.1.1
         with:
           repository: ${{ env.ISSUE_REPOSITORY }}
           issue-number: ${{ env.ISSUE_NUMBER }}
           file: .github/i18n/fr/lesson-review.md
-
-      - name: Create comment, add review content
+      - 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 }}
 
-  # 6) Désactivation une fois tout terminé
-  disable_step3:
-    name: Disable Step 3
+  disable_step4:
+    name: Disable Step 4
     needs: [post_review_content]
-    if: ${{ github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true }}
+    if: ${{ github.event_name == 'pull_request' && 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"
+        run: gh workflow disable ".github/workflows/4-last-step.yml"
         env:
           GH_TOKEN: ${{ github.token }}
         continue-on-error: true
