chore: minor CI fixes (#2725)

Author: chanceaclark

.github/scripts/prevent-invalid-changesets.js

@@ -16,7 +16,7 @@ module.exports = async ({ core, exec }) => {
 
     const allFilenames = stdout.split("\n").filter((line) => line.trim());
     const changesetFilenames = allFilenames.filter(
-      (file) => file.startsWith(".changeset/") && file.endsWith(".md")
+      (file) => file.startsWith(".changeset/") && file.endsWith(".md"),
     );
 
     if (changesetFilenames.length === 0) {
@@ -45,8 +45,10 @@ module.exports = async ({ core, exec }) => {
       }
 
       if (!fs.existsSync(filename)) {
-        core.setFailed(`File not found: ${filename}`);
-        return;
+        core.warning(
+          `File not found: ${filename}. This is likely a version PR where the changeset was already consumed. Skipping validation for this file.`,
+        );
+        continue;
       }
 
       // check file size (limit to 100KB)
@@ -83,18 +85,18 @@ module.exports = async ({ core, exec }) => {
 
       if (packageMatches) {
         const invalidPackages = packageMatches.filter(
-          (pkg) => pkg !== '"@bigcommerce/catalyst-makeswift"'
+          (pkg) => pkg !== '"@bigcommerce/catalyst-makeswift"',
         );
 
         if (invalidPackages.length > 0) {
           core.error(
             `Invalid package found in changeset file. Only @bigcommerce/catalyst-makeswift is allowed.`,
-            { file: filename }
+            { file: filename },
           );
           core.setFailed(
             `File ${filename} contains invalid packages: ${invalidPackages.join(
-              ", "
-            )}`
+              ", ",
+            )}`,
           );
           return;
         }

.github/workflows/basic.yml

@@ -2,7 +2,7 @@ name: Basic
 
 on:
   push:
-    branches: [canary]
+    branches: [canary, integrations/makeswift, integrations/b2b-makeswift]
   pull_request:
     types: [opened, synchronize]
   merge_group: