-
Notifications
You must be signed in to change notification settings - Fork 5.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
42 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,18 +7,23 @@ import * as yaml from "https://deno.land/[email protected]/encoding/yaml.ts"; | |
// automatically via regex, so ensure that this line maintains this format. | ||
const cacheVersion = 59; | ||
|
||
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 = (() => { | ||
const ubuntuRunner = "ubuntu-22.04"; | ||
const ubuntuXlRunner = "ubuntu-22.04-xl"; | ||
const windowsRunner = "windows-2022"; | ||
const windowsXlRunner = "windows-2022-xl"; | ||
|
||
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}' }}`, | ||
|
@@ -246,8 +251,10 @@ 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}`); | ||
} | ||
|
@@ -642,9 +649,9 @@ 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' &&", | ||
|
@@ -656,6 +663,21 @@ const ci = { | |
] | ||
.join("\n"), | ||
}, | ||
{ | ||
name: "Pre-release (mac aarch64)", | ||
if: [ | ||
`matrix.os == '${macosArmRunner}' &&`, | ||
"matrix.job == 'test' &&", | ||
"matrix.profile == 'release' &&", | ||
"github.repository == 'denoland/deno' &&", | ||
"(github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/'))", | ||
].join("\n"), | ||
run: [ | ||
"cd target/release", | ||
"zip -r deno-aarch64-apple-darwin.zip deno", | ||
] | ||
.join("\n"), | ||
}, | ||
{ | ||
name: "Pre-release (windows)", | ||
if: [ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters