Download via gh script

.github/workflows/canary.yaml

@@ -164,13 +164,6 @@ jobs:
             ${{ runner.os }}-pnpm-store-
       - name: Install
         run: pnpm install --filter=overlayed-root
-      - name: Download All Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: assets
-          pattern: overlayed-canary-*
-          merge-multiple: true
-      - run: ls -R assets
       - name: Upload Canary Binary to R2
         uses: actions/github-script@v7
         with:

package.json

@@ -18,6 +18,7 @@
   "devDependencies": {
     "@actions/github": "^6.0.0",
     "@aws-sdk/client-s3": "^3.592.0",
+    "@types/github-script": "github:actions/github-script",
     "dotenv": "^16.4.5",
     "eslint": "^9.3.0",
     "glob": "^10.3.10",

scripts/actions/upload-to-r2.js

@@ -4,8 +4,27 @@ import path from "path";
 
 const { R2_BUCKET, R2_ACCOUNT_ID, R2_ACCESS_KEY_ID, R2_SECRET_ACCESS_KEY } = process.env;
 
-// TODO: expand this to support the stable version too
-export const script = async ({ context, assetDir }) => {
+/** @param {import('@types/github-script').AsyncFunctionArguments} AsyncFunctionArguments */
+export const script = async ({ github, context }, assetDir) => {
+  const artifacts = await github.rest.actions.listWorkflowRunArtifacts({
+    owner: context.repo.owner,
+    repo: context.repo.repo,
+    run_id: context.runId || "10445719576",
+  });
+
+  // download all the artifacts from the build
+  for (const artifact of artifacts.data.artifacts) {
+    console.log(`Downloading ${artifact.name}...`);
+    const { data } = await github.rest.actions.downloadArtifact({
+      owner: context.repo.owner,
+      repo: context.repo.repo,
+      artifact_id: artifact.id,
+      archive_format: "zip",
+    });
+
+    fs.writeFileSync(path.join(assetDir, `${artifact.name}`), Buffer.from(data));
+  }
+
   console.log("Starting upload to R2...");
   const client = new S3Client({
     endpoint: `https://${R2_ACCOUNT_ID}.r2.cloudflarestorage.com`,
@@ -23,7 +42,7 @@ export const script = async ({ context, assetDir }) => {
 
       const uploadBinsCommand = new PutObjectCommand({
         Bucket: R2_BUCKET,
-        Key: `canary/${file.replace(".zip", "")}`,
+        Key: `canary/${file}`,
         Body: fileStream,
       });
 

scripts/test.ts

@@ -51,7 +51,7 @@ switch (arg) {
     await patchCanaryVersion({ github, context });
     break;
   case "upload-r2":
-    await uploadBinsToR2({ context: { sha: "1212" }, assetDir: "assets" });
+    await uploadBinsToR2({ github, context }, "assets");
     break;
   default:
     console.log("No script found, accepted answers are: create, download, upload, r2");