try without polling and instead wait for comemnt events

almk-dev · almk-dev · commit c42b376bb13f · 2025-09-21T05:38:33.000-04:00
diff --git a/.github/workflows/d2gen.yml b/.github/workflows/d2gen.yml
@@ -3,6 +3,8 @@ name: D2 Gen
 on:
   pull_request:
     branches: [ main ]
+  issue_comment:
+    types: [created]
 
 concurrency:
   group: d2gen-${{ github.ref }}-${{ github.event_name }}
@@ -15,26 +17,76 @@ permissions:
 jobs:
   d2gen:
     runs-on: ubuntu-latest
+    # Skip workflow if triggered by comment reaction but not on a PR
+    if: github.event_name == 'pull_request' || (github.event_name == 'issue_comment' && github.event.issue.pull_request)
     # container: terrastruct/d2:latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           fetch-depth: 0
-          ref: ${{ github.head_ref }}
+          ref: ${{ github.event_name == 'pull_request' && github.head_ref || github.event.issue.pull_request.head.ref }}
+
+      - name: Handle comment reaction
+        if: github.event_name == 'issue_comment'
+        id: handle_reaction
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const comment = context.payload.comment;
+            const issue = context.payload.issue;
+            
+            // Check if this comment is about SVG files
+            if (!comment.body.includes('SVG Files Updated')) {
+              console.log('Comment is not about SVG files, skipping workflow');
+              core.setOutput('skip_workflow', 'true');
+              return;
+            }
+            
+            // Get reactions for this comment
+            const { data: reactions } = await github.rest.reactions.listForIssueComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              comment_id: comment.id
+            });
+            
+            const thumbsUp = reactions.find(r => r.content === '+1');
+            const thumbsDown = reactions.find(r => r.content === '-1');
+            
+            if (thumbsUp) {
+              console.log('👍 reaction detected - will commit changes');
+              core.setOutput('user_approved', 'true');
+            } else if (thumbsDown) {
+              console.log('👎 reaction detected - will skip changes');
+              core.setOutput('user_approved', 'false');
+            } else {
+              console.log('No relevant reaction found');
+              core.setOutput('user_approved', 'false');
+            }
+            
+            core.setOutput('skip_workflow', 'false');
+
+      - name: Exit early if workflow should be skipped
+        if: github.event_name == 'issue_comment' && steps.handle_reaction.outputs.skip_workflow == 'true'
+        run: |
+          echo "Skipping workflow - comment not related to SVG generation"
+          exit 0
 
       - name: Install D2
+        if: github.event_name == 'pull_request'
         run: |
           curl -fsSL https://d2lang.com/install.sh | sh -s -- --tala
           echo "$HOME/.local/bin" >> $GITHUB_PATH
 
       - name: Generate SVG images from D2 
+        if: github.event_name == 'pull_request'
         env:
           TSTRUCT_TOKEN: ${{ secrets.TSTRUCT_TOKEN }}
         run: make d2gen-all
 
       - name: Check for changes in SVG files
+        if: github.event_name == 'pull_request'
         id: check_changes
         run: |
           if git diff --quiet '*.svg'; then
@@ -46,15 +98,15 @@ jobs:
           fi
 
       - name: Get changed SVG files
-        if: steps.check_changes.outputs.changed == 'true'
+        if: github.event_name == 'pull_request' && steps.check_changes.outputs.changed == 'true'
         id: get_changed_files
         run: |
           echo "files<<EOF" >> $GITHUB_OUTPUT
           git diff --name-only '*.svg'
           echo "EOF" >> $GITHUB_OUTPUT
 
       - name: Create PR comment for approval
-        if: steps.check_changes.outputs.changed == 'true'
+        if: github.event_name == 'pull_request' && steps.check_changes.outputs.changed == 'true'
         id: pr_comment
         uses: actions/github-script@v7
         with:
@@ -71,12 +123,12 @@ jobs:
               changedFiles,
               "```",
               "",
-              "Would you like me to commit these changes to this PR?",
+              "**This CI run will fail** until you make a choice. React to this comment:",
               "",
-              "- 👍 **Yes** - Automatically commit the updated SVG files",
-              "- 👎 **No** - Skip committing, CI will pass without the changes",
+              "- 👍 **Yes** - React to automatically commit the updated SVG files and re-run CI",
+              "- 👎 **No** - React to skip committing and re-run CI (it will pass)",
               "",
-              "Please react to this comment with your choice."
+              "After you react, the CI will automatically run again with your choice."
             ].join("\\n");
 
             const { data: comment } = await github.rest.issues.createComment({
@@ -88,75 +140,9 @@ jobs:
 
             return comment.id;
 
-      - name: Wait for user reaction
-        if: steps.check_changes.outputs.changed == 'true'
-        id: wait_reaction
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const commentId = parseInt('${{ steps.pr_comment.outputs.result }}');
-            console.log('Starting wait for user reaction, commentId:', commentId);
-            const maxWaitTime = 60000; // 1 minute for testing
-            const pollInterval = 5000; // 5 seconds
-            let elapsedTime = 0;
-
-            while (elapsedTime < maxWaitTime) {
-              console.log(`Polling for reactions (${elapsedTime/1000}s elapsed)...`);
-              const { data: reactions } = await github.rest.reactions.listForIssueComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                comment_id: commentId
-              });
-
-              const thumbsUp = reactions.find(r => r.content === '+1');
-              const thumbsDown = reactions.find(r => r.content === '-1');
-
-              if (thumbsUp) {
-                console.log('User approved changes with 👍');
-                require('fs').appendFileSync(process.env.GITHUB_OUTPUT, 'result=approve\n');
-                return 'approve';
-              } else if (thumbsDown) {
-                console.log('User declined changes with 👎');
-                require('fs').appendFileSync(process.env.GITHUB_OUTPUT, 'result=decline\n');
-                return 'decline';
-              }
-
-              await new Promise(resolve => setTimeout(resolve, pollInterval));
-              elapsedTime += pollInterval;
-            }
-
-            console.log('Timeout reached, defaulting to decline');
-            require('fs').appendFileSync(process.env.GITHUB_OUTPUT, 'result=decline\n');
-            return 'decline';
-
-      - name: Debug wait reaction step
-        if: always()
-        run: |
-          echo "🔍 Checking if wait_reaction step ran..."
-          echo "Wait reaction step conclusion: ${{ steps.wait_reaction.conclusion }}"
-          echo "Wait reaction step outcome: ${{ steps.wait_reaction.outcome }}"
-          echo "Wait reaction step outputs.result: '${{ steps.wait_reaction.outputs.result }}'"
-
-      - name: Always debug outputs
-        run: |
-          echo "🐛 Always running debug - checking all outputs..."
-          echo "Changed files detected: '${{ steps.check_changes.outputs.changed }}'"
-          echo "User reaction result: '${{ steps.wait_reaction.outputs.result }}'"
-          echo "PR comment ID: '${{ steps.pr_comment.outputs.result }}'"
-          echo "Condition 1 (changes): ${{ steps.check_changes.outputs.changed == 'true' }}"
-          echo "Condition 2 (approve): ${{ steps.wait_reaction.outputs.result == 'approve' }}"
-          echo "Combined condition: ${{ steps.check_changes.outputs.changed == 'true' && steps.wait_reaction.outputs.result == 'approve' }}"
-
-      - name: Debug step conditions
-        if: steps.check_changes.outputs.changed == 'true'
-        run: |
-          echo "🐛 Conditional debug (changes detected)..."
-          echo "Changed files detected: ${{ steps.check_changes.outputs.changed }}"
-          echo "User reaction result: ${{ steps.wait_reaction.outputs.result }}"
-          echo "Will commit changes: ${{ steps.check_changes.outputs.changed == 'true' && steps.wait_reaction.outputs.result == 'approve' }}"
 
       - name: Commit and push changes
-        if: steps.check_changes.outputs.changed == 'true' # && steps.wait_reaction.outputs.result == 'approve'
+        if: github.event_name == 'issue_comment' && steps.handle_reaction.outputs.user_approved == 'true'
         run: |
           echo "🔧 Setting up git configuration..."
           git config --local user.email "action@github.com"
@@ -184,40 +170,52 @@ jobs:
           git push
 
       - name: Update PR comment with result
-        if: steps.check_changes.outputs.changed == 'true'
+        if: github.event_name == 'issue_comment'
         uses: actions/github-script@v7
         with:
           script: |
-            const commentId = parseInt('${{ steps.pr_comment.outputs.result }}');
-            const action = '${{ steps.wait_reaction.outputs.result }}';
+            const comment = context.payload.comment;
+            const userApproved = '${{ steps.handle_reaction.outputs.user_approved }}';
 
             let updateBody;
-            if (action === 'approve') {
+            if (userApproved === 'true') {
               updateBody = [
                 "## SVG Files Updated ✅",
                 "",
                 "The updated SVG files have been successfully committed to this PR.",
                 "",
-                "**Status:** Changes committed automatically based on user approval."
+                "**Status:** Changes committed automatically based on user approval (👍 reaction)."
               ].join("\\n");
             } else {
               updateBody = [
                 "## SVG Files Updated ⏭️",
                 "",
-                "The SVG files have changes but were not committed based on user choice or timeout.",
+                "The SVG files had changes but were not committed based on user choice.",
                 "",
-                "**Status:** CI will pass without committing the changes."
+                "**Status:** CI passed without committing the changes (👎 reaction or no approval)."
               ].join("\\n");
             }
 
             await github.rest.issues.updateComment({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              comment_id: commentId,
+              comment_id: comment.id,
               body: updateBody
             });
 
-      - name: Always pass CI
+      - name: Fail CI if changes detected and no user approval
+        if: github.event_name == 'pull_request' && steps.check_changes.outputs.changed == 'true'
+        run: |
+          echo "❌ SVG files need to be updated but no user approval received"
+          echo "Please react to the comment above to approve or decline the changes"
+          exit 1
+
+      - name: Pass CI - no changes or user handled reaction  
         run: |
-          echo "SVG generation workflow completed successfully"
+          echo "✅ SVG generation workflow completed successfully"
+          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            echo "No SVG changes detected"
+          else
+            echo "User reaction processed"
+          fi
           exit 0
