denoland · Nov 24, 2023 · Nov 24, 2023 · Nov 24, 2023 · Nov 24, 2023 · Nov 24, 2023
diff --git a/.dprint.json b/.dprint.json
@@ -55,10 +55,10 @@
     "ext/websocket/autobahn/reports"
   ],
   "plugins": [
-    "https://plugins.dprint.dev/typescript-0.88.3.wasm",
+    "https://plugins.dprint.dev/typescript-0.88.4.wasm",
     "https://plugins.dprint.dev/json-0.19.0.wasm",
     "https://plugins.dprint.dev/markdown-0.16.2.wasm",
     "https://plugins.dprint.dev/toml-0.5.4.wasm",
-    "https://plugins.dprint.dev/exec-0.4.3.json@42343548b8022c99b1d750be6b894fe6b6c7ee25f72ae9f9082226dd2e515072"
+    "https://plugins.dprint.dev/exec-0.4.4.json@c207bf9b9a4ee1f0ecb75c594f774924baf62e8e53a2ce9d873816a408cecbf7"
   ]
 }
diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts
@@ -5,20 +5,24 @@ import * as yaml from "https://deno.land/std@0.173.0/encoding/yaml.ts";
 // Bump this number when you want to purge the cache.
 // Note: the tools/release/01_bump_crate_versions.ts script will update this version
 // automatically via regex, so ensure that this line maintains this format.
-const cacheVersion = 59;
+const cacheVersion = 60;
 
-const Runners = (() => {
-  const ubuntuRunner = "ubuntu-22.04";
-  const ubuntuXlRunner = "ubuntu-22.04-xl";
-  const windowsRunner = "windows-2022";
-  const windowsXlRunner = "windows-2022-xl";
+const ubuntuRunner = "ubuntu-22.04";
+const ubuntuXlRunner = "ubuntu-22.04-xl";
+const windowsRunner = "windows-2022";
+const windowsXlRunner = "windows-2022-xl";
+const macosX86Runner = "macos-12";
+// https://github.blog/2023-10-02-introducing-the-new-apple-silicon-powered-m1-macos-larger-runner-for-github-actions/
+const macosArmRunner = "macos-13-xlarge";
 
+const Runners = (() => {
   return {
     ubuntuXl:
       `\${{ github.repository == 'denoland/deno' && '${ubuntuXlRunner}' || '${ubuntuRunner}' }}`,
     ubuntu: ubuntuRunner,
     linux: ubuntuRunner,
-    macos: "macos-12",
+    macos: macosX86Runner,
+    macosArm: macosArmRunner,
     windows: windowsRunner,
     windowsXl:
       `\${{ github.repository == 'denoland/deno' && '${windowsXlRunner}' || '${windowsRunner}' }}`,
@@ -199,7 +203,7 @@ function skipJobsIfPrAndMarkedSkip(
   return steps.map((s) =>
     withCondition(
       s,
-      "!(github.event_name == 'pull_request' && matrix.skip_pr)",
+      "!(matrix.skip)",
     )
   );
 }
@@ -235,6 +239,7 @@ function removeSurroundingExpression(text: string) {
 
 function handleMatrixItems(items: {
   skip_pr?: string | true;
+  skip?: string;
   os: string;
   profile?: string;
   job?: string;
@@ -246,27 +251,44 @@ function handleMatrixItems(items: {
       return "ubuntu-x86_64";
     } else if (os.includes("windows")) {
       return "windows-x86_64";
-    } else if (os.includes("macos")) {
+    } else if (os == macosX86Runner) {
       return "macos-x86_64";
+    } else if (os == macosArmRunner) {
+      return "macos-aarch64";
     } else {
       throw new Error(`Display name not found: ${os}`);
     }
   }
 
   return items.map((item) => {
-    // use a free "ubuntu" runner on jobs that are skipped on pull requests
+    // use a free "ubuntu" runner on jobs that are skipped
+
+    // skip_pr is shorthand for skip = github.event_name == 'pull_request'.
     if (item.skip_pr != null) {
-      let text = "${{ github.event_name == 'pull_request' && ";
-      if (typeof item.skip_pr === "string") {
-        text += removeSurroundingExpression(item.skip_pr.toString()) + " && ";
+      if (item.skip_pr === true) {
+        item.skip = "${{ github.event_name == 'pull_request' }}";
+      } else if (typeof item.skip_pr === "string") {
+        item.skip = "${{ github.event_name == 'pull_request' && " +
+          removeSurroundingExpression(item.skip_pr.toString()) + " }}";
       }
+      delete item.skip_pr;
+    }
+
+    if (typeof item.skip === "string") {
+      let text =
+        "${{ (!contains(github.event.pull_request.labels.*.name, 'ci-full') && (";
+      text += removeSurroundingExpression(item.skip.toString()) + ")) && ";
       text += `'${Runners.ubuntu}' || ${
         removeSurroundingExpression(item.os)
       } }}`;
 
       // deno-lint-ignore no-explicit-any
       (item as any).runner = text;
+      item.skip =
+        "${{ !contains(github.event.pull_request.labels.*.name, 'ci-full') && (" +
+        removeSurroundingExpression(item.skip.toString()) + ") }}";
     }
+
     return {
       ...item,
       os_display_name: getOsDisplayName(item.os),
@@ -343,6 +365,13 @@ const ci = {
             job: "test",
             profile: "release",
             skip_pr: true,
+          }, {
+            os: Runners.macosArm,
+            job: "test",
+            profile: "release",
+            // TODO(mmastrac): We don't want to run this M1 runner on every main commit because of the expense.
+            skip:
+              "${{ github.event_name == 'pull_request' || github.ref == 'refs/heads/main' }}",
           }, {
             os: Runners.windows,
             job: "test",
@@ -497,6 +526,22 @@ const ci = {
           if: "matrix.use_sysroot",
           ...sysRootStep,
         },
+        {
+          name: "Install aarch64 lld",
+          run: [
+            "./tools/install_prebuilt.js ld64.lld",
+          ].join("\n"),
+          if: `matrix.os == '${macosArmRunner}'`,
+        },
+        {
+          name: "Install rust-codesign",
+          run: [
+            "./tools/install_prebuilt.js rcodesign",
+            "echo $GITHUB_WORKSPACE/third_party/prebuilt/mac >> $GITHUB_PATH",
+          ].join("\n"),
+          if:
+            `(matrix.os == '${macosArmRunner}' || matrix.os == '${macosX86Runner}')`,
+        },
         {
           name: "Log versions",
           run: [
@@ -601,9 +646,7 @@ const ci = {
           if: [
             "(matrix.job == 'test' || matrix.job == 'bench') &&",
             "matrix.profile == 'release' && (matrix.use_sysroot ||",
-            "(github.repository == 'denoland/deno' &&",
-            "(github.ref == 'refs/heads/main' ||",
-            "startsWith(github.ref, 'refs/tags/'))))",
+            "github.repository == 'denoland/deno')",
           ].join("\n"),
           run: [
             // output fs space before and after building
@@ -642,28 +685,60 @@ const ci = {
           ].join("\n"),
         },
         {
-          name: "Pre-release (mac)",
+          name: "Pre-release (mac intel)",
           if: [
-            "startsWith(matrix.os, 'macOS') &&",
+            `matrix.os == '${macosX86Runner}' &&`,
             "matrix.job == 'test' &&",
             "matrix.profile == 'release' &&",
-            "github.repository == 'denoland/deno' &&",
-            "(github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/'))",
+            "github.repository == 'denoland/deno'",
           ].join("\n"),
+          env: {
+            "APPLE_CODESIGN_KEY": "${{ secrets.APPLE_CODESIGN_KEY }}",
+            "APPLE_CODESIGN_PASSWORD": "${{ secrets.APPLE_CODESIGN_PASSWORD }}",
+          },
           run: [
+            'echo "Key is $(echo $APPLE_CODESIGN_KEY | base64 -d | wc -c) bytes"',
+            "rcodesign sign target/release/deno " +
+            "--code-signature-flags=runtime " +
+            '--p12-password="$APPLE_CODESIGN_PASSWORD" ' +
+            "--p12-file=<(echo $APPLE_CODESIGN_KEY | base64 -d) " +
+            "--entitlements-xml-file=cli/entitlements.plist",
             "cd target/release",
             "zip -r deno-x86_64-apple-darwin.zip deno",
           ]
             .join("\n"),
         },
+        {
+          name: "Pre-release (mac aarch64)",
+          if: [
+            `matrix.os == '${macosArmRunner}' &&`,
+            "matrix.job == 'test' &&",
+            "matrix.profile == 'release' &&",
+            "github.repository == 'denoland/deno'",
+          ].join("\n"),
+          env: {
+            "APPLE_CODESIGN_KEY": "${{ secrets.APPLE_CODESIGN_KEY }}",
+            "APPLE_CODESIGN_PASSWORD": "${{ secrets.APPLE_CODESIGN_PASSWORD }}",
+          },
+          run: [
+            'echo "Key is $(echo $APPLE_CODESIGN_KEY | base64 -d | wc -c) bytes"',
+            "rcodesign sign target/release/deno " +
+            "--code-signature-flags=runtime " +
+            '--p12-password="$APPLE_CODESIGN_PASSWORD" ' +
+            "--p12-file=<(echo $APPLE_CODESIGN_KEY | base64 -d) " +
+            "--entitlements-xml-file=cli/entitlements.plist",
+            "cd target/release",
+            "zip -r deno-aarch64-apple-darwin.zip deno",
+          ]
+            .join("\n"),
+        },
         {
           name: "Pre-release (windows)",
           if: [
             "startsWith(matrix.os, 'windows') &&",
             "matrix.job == 'test' &&",
             "matrix.profile == 'release' &&",
-            "github.repository == 'denoland/deno' &&",
-            "(github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/'))",
+            "github.repository == 'denoland/deno'",
           ].join("\n"),
           shell: "pwsh",
           run:
@@ -718,7 +793,7 @@ const ci = {
           name: "Test debug (fast)",
           if: [
             "matrix.job == 'test' && matrix.profile == 'debug' &&",
-            "!startsWith(matrix.os, 'ubuntu')",
+            "(startsWith(github.ref, 'refs/tags/') || !startsWith(matrix.os, 'ubuntu'))",
           ].join("\n"),
           run: [
             // Run unit then integration tests. Skip doc tests here
@@ -734,7 +809,7 @@ const ci = {
             "matrix.job == 'test' && matrix.profile == 'release' &&",
             "(matrix.use_sysroot || (",
             "github.repository == 'denoland/deno' &&",
-            "github.ref == 'refs/heads/main' && !startsWith(github.ref, 'refs/tags/')))",
+            "!startsWith(github.ref, 'refs/tags/')))",
           ].join("\n"),
           run: "cargo test --release --locked",
         },
@@ -939,6 +1014,7 @@ const ci = {
               "target/release/deno-x86_64-pc-windows-msvc.zip",
               "target/release/deno-x86_64-unknown-linux-gnu.zip",
               "target/release/deno-x86_64-apple-darwin.zip",
+              "target/release/deno-aarch64-apple-darwin.zip",
               "target/release/deno_src.tar.gz",
               "target/release/lib.deno.d.ts",
             ].join("\n"),