Commit

bufbuild · Jul 5, 2024 · fb00366 · fb00366
1 parent 101b990
commit fb00366
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 28 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -160,13 +160,14 @@ jobs:
           archive: false
           pr_comment: true
       - uses: actions/github-script@v7
-        if: false
         with:
           script: |
-            const expectedComment = `The latest Buf updates on your PR.
-
-            <table><tr><th>Name</th><th>Status</th></tr><tr><td>build</td><td>✅ passed</td></tr><tr><td>lint</td><td>⏩ skipped</td></tr><tr><td>format</td><td>❌ failed</td></tr><tr><td>breaking</td><td>✅ passed</td></tr></table>
-            <!-- Buf results -->`
+            const expects = [
+              "The latest Buf updates on your PR.",
+              "✅ passed",
+              "❌ failed (1)",
+              "⏩ skipped",
+            ];
             const commentTag = "<!-- Buf results -->";
             const { owner, repo } = context.repo;
             const prNumber = context.payload.pull_request?.number;
@@ -186,11 +187,11 @@ jobs:
               core.setFailed('Missing comment on pull request.');
               return;
             }
-            if (!previousComment.body?.includes(expectedComment)) {
-              core.setFailed('Comment does not match expected.');
-              core.info(`Expected: ${expectedComment}`);
-              core.info(`Comment: ${previousComment.body}`);
-              return;
+            for (const line of expects) {
+              if (!previousComment.body?.includes(line)) {
+                core.setFailed(`Comment does not include expected line: ${line}`);
+                return;
+              }
             }
             await github.rest.issues.updateComment({
               owner: owner,

diff --git a/dist/index.js b/dist/index.js
@@ -45835,18 +45835,15 @@ function createSummary(inputs, steps, moduleNames) {
             }),
         ],
     ];
-    console.log("moduleNames", moduleNames);
     // If push or archive is enabled add a link to the registry.
-    //if (inputs.push) table.push(["push", message(steps.push?.status)]);
-    //if (inputs.archive) table.push(["archive", message(steps.archive?.status)]);
     let output = core.summary.addTable(table);
     if (inputs.push && moduleNames.length > 0) {
         const modules = moduleNames.map((moduleName) => `<a href="https://${moduleName.name}">${moduleName.name}</a>`);
-        output = output.addRaw(`Pushed ${modules.join(", ")} to registry.`, true);
+        output = output.addRaw(`Pushed to ${modules.join(", ")}.`, true);
     }
     if (inputs.archive && moduleNames.length > 0) {
         const modules = moduleNames.map((moduleName) => `<a href="https://${moduleName.name}">${moduleName.name}</a>`);
-        output = output.addRaw(`Archived ${modules.join(", ")} with ${inputs.archive_labels.join(", ")} labels.`, true);
+        output = output.addRaw(`Archived labels ${inputs.archive_labels.join(", ")} to ${modules.join(", ")}.`, true);
     }
     return output;
 }
@@ -46111,13 +46108,13 @@ function pass() {
 function message(result) {
     switch (result?.status) {
         case Status.Passed:
-            return "✅ passed";
+            return "<code>✅ passed</code>";
         case Status.Failed:
-            return `❌ failed (${result.stdout.split("\n").length - 1})`;
+            return `<code>❌ failed (${result.stdout.split("\n").length - 1})</code>`;
         case Status.Skipped:
-            return "⏩ skipped";
+            return "<code>⏩ skipped</code>";
         default:
-            return "🚫 cancelled";
+            return "<code>🚫 cancelled</code>";
     }
 }
 

diff --git a/src/main.ts b/src/main.ts
@@ -112,25 +112,22 @@ function createSummary(
       }),
     ],
   ];
-  console.log("moduleNames", moduleNames);
   // If push or archive is enabled add a link to the registry.
-  //if (inputs.push) table.push(["push", message(steps.push?.status)]);
-  //if (inputs.archive) table.push(["archive", message(steps.archive?.status)]);
   let output = core.summary.addTable(table);
   if (inputs.push && moduleNames.length > 0) {
     const modules = moduleNames.map(
       (moduleName) =>
         `<a href="https://${moduleName.name}">${moduleName.name}</a>`,
     );
-    output = output.addRaw(`Pushed ${modules.join(", ")} to registry.`, true);
+    output = output.addRaw(`Pushed to ${modules.join(", ")}.`, true);
   }
   if (inputs.archive && moduleNames.length > 0) {
     const modules = moduleNames.map(
       (moduleName) =>
         `<a href="https://${moduleName.name}">${moduleName.name}</a>`,
     );
     output = output.addRaw(
-      `Archived ${modules.join(", ")} with ${inputs.archive_labels.join(", ")} labels.`,
+      `Archived labels ${inputs.archive_labels.join(", ")} to ${modules.join(", ")}.`,
       true,
     );
   }
@@ -438,12 +435,12 @@ function pass(): Result {
 function message(result: Result | undefined): string {
   switch (result?.status) {
     case Status.Passed:
-      return "✅ passed";
+      return "<code>✅ passed</code>";
     case Status.Failed:
-      return `❌ failed (${result.stdout.split("\n").length - 1})`;
+      return `<code>❌ failed (${result.stdout.split("\n").length - 1})</code>`;
     case Status.Skipped:
-      return "⏩ skipped";
+      return "<code>⏩ skipped</code>";
     default:
-      return "🚫 cancelled";
+      return "<code>🚫 cancelled</code>";
   }
 }