diff options
| author | Bartek Iwańczuk <biwanczuk@gmail.com> | 2024-09-28 21:57:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-28 22:57:01 +0200 |
| commit | 3138478f66823348eb745c7f0c2d34eed378a3f0 (patch) | |
| tree | a7259ac5e22f4019e3d0ddaedad98cbf89a06fcc /.github | |
| parent | 1bb47805d6331ad048bd5e7ea2581aa230e8fc93 (diff) | |
Revert "ci: use macos-14-xlarge on 'main' branch (#25908)" (#25913)
This reverts commit 0f617be84a8e9edf73803210c24af43f729a97de.
Reverting because it was an experiment.
Diffstat (limited to '.github')
| -rwxr-xr-x | .github/workflows/ci.generate.ts | 9 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts index e9fcacc82..35020a5f8 100755 --- a/.github/workflows/ci.generate.ts +++ b/.github/workflows/ci.generate.ts @@ -14,7 +14,6 @@ const windowsX86Runner = "windows-2022"; const windowsX86XlRunner = "windows-2022-xl"; const macosX86Runner = "macos-13"; const macosArmRunner = "macos-14"; -const macosArmXlRunner = "macos-14-xlarge"; const Runners = { linuxX86: { @@ -43,12 +42,6 @@ const Runners = { arch: "aarch64", runner: macosArmRunner, }, - macosArmXl: { - os: "macos", - arch: "aarch64", - runner: - `\${{ github.repository == 'denoland/deno' && '${macosArmXlRunner}' || '${macosArmRunner}' }}`, - }, windowsX86: { os: "windows", arch: "x86_64", @@ -385,7 +378,7 @@ const ci = { job: "test", profile: "debug", }, { - ...Runners.macosArmXl, + ...Runners.macosArm, job: "test", profile: "release", skip_pr: true, diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 035a4244f..280eb7cb8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,7 +73,7 @@ jobs: profile: debug - os: macos arch: aarch64 - runner: '${{ (!contains(github.event.pull_request.labels.*.name, ''ci-full'') && (github.event_name == ''pull_request'')) && ''ubuntu-22.04'' || github.repository == ''denoland/deno'' && ''macos-14-xlarge'' || ''macos-14'' }}' + runner: '${{ (!contains(github.event.pull_request.labels.*.name, ''ci-full'') && (github.event_name == ''pull_request'')) && ''ubuntu-22.04'' || ''macos-14'' }}' job: test profile: release skip: '${{ !contains(github.event.pull_request.labels.*.name, ''ci-full'') && (github.event_name == ''pull_request'') }}' |