CI: Continue iterating on output (#188)

* CI: Continue iterating on output

* Add base64 encoding due to multi-line output

* Add checks

* wip: checks

* wip: checks, remove always()

* Change CPG

* Update GTM

* Change CPG again

* Change output method

Author: robertjdominguez

.github/workflows/create-build.yml

@@ -49,13 +49,15 @@ jobs:
 
           if [ -z "$CHANGED_DEMOS" ]; then
             echo "No demo changes detected"
-            exit 1
+            echo "demos=" >> $GITHUB_OUTPUT
+            echo "no_changes=true" >> $GITHUB_OUTPUT
+          else
+            echo "demos<<EOF" >> $GITHUB_OUTPUT
+            echo "$CHANGED_DEMOS" >> $GITHUB_OUTPUT
+            echo "EOF" >> $GITHUB_OUTPUT
+            echo "no_changes=false" >> $GITHUB_OUTPUT
           fi
 
-          echo "demos<<EOF" >> $GITHUB_OUTPUT
-          echo "$CHANGED_DEMOS" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-
       - name: Install DDN CLI
         run: |
           curl -L https://graphql-engine-cdn.hasura.io/ddn/cli/v4/get.sh | bash
@@ -124,8 +126,11 @@ jobs:
 
       - name: Build all changed demos
         id: build
+        if: steps.demo-setup.outputs.no_changes != 'true'
         run: |
           BUILDS_JSON="[]"
+          echo "Starting build process..."
+          echo "Demos to build: ${{ steps.demo-setup.outputs.demos }}"
 
           while IFS= read -r demo; do
             echo "Building demo: $demo"
@@ -261,25 +266,53 @@ jobs:
             esac
             
             # Build this demo
+            echo "Running ddn supergraph build create for $demo..."
             BUILD_OUTPUT=$(ddn supergraph build create --out json -d "PR #${{ github.event.number }}: ${{ github.event.pull_request.title }} ($demo)")
+            echo "Raw build output for $demo:"
+            echo "$BUILD_OUTPUT"
             
             # Add demo name to build output and append to array
             BUILD_WITH_DEMO=$(echo "$BUILD_OUTPUT" | jq ". + {\"demo\": \"$demo\"}")
+            echo "Build with demo name added:"
+            echo "$BUILD_WITH_DEMO"
+            
             BUILDS_JSON=$(echo "$BUILDS_JSON" | jq ". += [$BUILD_WITH_DEMO]")
+            echo "Updated builds array:"
+            echo "$BUILDS_JSON"
             
             cd ../..
           done <<< "${{ steps.demo-setup.outputs.demos }}"
 
-          echo "builds_output<<EOF" >> $GITHUB_OUTPUT
-          echo "$BUILDS_JSON" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
+          echo "Final builds output:"
+          echo "$BUILDS_JSON"
+
+          # Use base64 encoding to preserve the JSON structure
+          echo "builds_output=$(echo "$BUILDS_JSON" | base64 -w 0)" >> $GITHUB_OUTPUT
+
+      - name: Debug build output
+        if: always() && steps.demo-setup.outputs.no_changes != 'true'
+        run: |
+          echo "Build step outputs:"
+          BUILDS_OUTPUT=$(echo "${{ steps.build.outputs.builds_output }}" | base64 -d)
+          echo "builds_output = $BUILDS_OUTPUT"
+          echo "Length of builds_output: ${#BUILDS_OUTPUT}"
+
+          # Try to parse it as JSON
+          if echo "$BUILDS_OUTPUT" | jq . > /dev/null 2>&1; then
+            echo "✅ builds_output is valid JSON"
+            echo "$BUILDS_OUTPUT" | jq .
+          else
+            echo "❌ builds_output is not valid JSON"
+          fi
 
       - name: Comment on PR
-        if: always()
+        id: pr-comment
+        if: steps.demo-setup.outputs.no_changes != 'true'
         uses: actions/github-script@v7
         with:
           script: |
-            const builds = JSON.parse(`${{ steps.build.outputs.builds_output }}`);
+            const buildsJson = Buffer.from('${{ steps.build.outputs.builds_output }}', 'base64').toString();
+            const builds = JSON.parse(buildsJson);
             const commitSha = context.payload.pull_request.head.sha.substring(0, 7);
 
             let comment = `## 🚀 PromptQL Builds Complete (${commitSha})\n\n`;
@@ -295,23 +328,38 @@ jobs:
               comment += `\n`;
             });
 
-            // Always create a new comment
-            await github.rest.issues.createComment({
+            // Create the comment and return its ID
+            const response = await github.rest.issues.createComment({
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
               body: comment
             });
 
+            return response.data.id;
+
       - name: Notify Slack
-        if: always()
+        if: steps.demo-setup.outputs.no_changes != 'true'
         uses: actions/github-script@v7
         env:
           SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
           SLACK_CHANNEL_ID: ${{ secrets.SLACK_CHANNEL_ID }}
         with:
           script: |
-            const builds = JSON.parse(`${{ steps.build.outputs.builds_output }}`);
+            // Debug: Check if secrets are available
+            if (!process.env.SLACK_BOT_TOKEN) {
+              console.log('❌ SLACK_BOT_TOKEN secret not found');
+              return;
+            }
+            if (!process.env.SLACK_CHANNEL_ID) {
+              console.log('❌ SLACK_CHANNEL_ID secret not found');
+              return;
+            }
+
+            console.log('✅ Slack secrets found');
+
+            const buildsJson = Buffer.from('${{ steps.build.outputs.builds_output }}', 'base64').toString();
+            const builds = JSON.parse(buildsJson);
             const commitSha = context.payload.pull_request.head.sha.substring(0, 7);
 
             // Create message for each build
@@ -328,7 +376,7 @@ jobs:
               slackMessage += `\n`;
             });
 
-            // Find existing PR thread
+            // Find existing PR thread by looking for build comments
             const comments = await github.rest.issues.listComments({
               issue_number: context.issue.number,
               owner: context.repo.owner,
@@ -337,11 +385,12 @@ jobs:
 
             let threadTs = null;
             const threadComment = comments.data.find(comment => 
+              comment.body.includes('🚀 PromptQL Builds Complete') && 
               comment.body.includes('<!-- slack-thread-ts:')
             );
 
             if (threadComment) {
-              const match = threadComment.body.match(/<!-- slack-thread-ts:([^-]+) -->/);
+              const match = threadComment.body.match(/<!-- slack-thread-ts:([^-\s]+)/);
               threadTs = match ? match[1] : null;
             }
 
@@ -369,12 +418,19 @@ jobs:
               if (slackData.ok) {
                 threadTs = slackData.ts;
                 
-                // Store thread timestamp
-                await github.rest.issues.createComment({
-                  issue_number: context.issue.number,
+                // Update the GitHub comment with thread timestamp
+                const commentId = ${{ steps.pr-comment.outputs.result }};
+                const existingComment = await github.rest.issues.getComment({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  comment_id: commentId
+                });
+                
+                await github.rest.issues.updateComment({
                   owner: context.repo.owner,
                   repo: context.repo.repo,
-                  body: `<!-- slack-thread-ts:${threadTs} -->`
+                  comment_id: commentId,
+                  body: existingComment.data.body + `\n<!-- slack-thread-ts:${threadTs} -->`
                 });
               }
             }

demos/cpg/README.md

@@ -1,3 +1,3 @@
 # CPG Demo
 
-Adding here as a test to trigger CI.
+Adding here as a test to trigger CI...

demos/gtm/README.md

@@ -1,3 +1,3 @@
 # GTM Demo
 
-Adding here as a test to trigger CI.
+Adding here as a test to trigger CI...