From 524e4264573cd30a9bc3db28f44cf2b62e867dfa Mon Sep 17 00:00:00 2001 From: David Sherret Date: Thu, 8 Jun 2023 15:27:31 -0400 Subject: [PATCH] ci: use windows-xl runner for `--release` on main (#19429) --- .github/workflows/ci.generate.ts | 8 ++++++-- .github/workflows/ci.yml | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts index f6c94441bd..cedf91b6c5 100755 --- a/.github/workflows/ci.generate.ts +++ b/.github/workflows/ci.generate.ts @@ -10,6 +10,8 @@ const cacheVersion = 36; const Runners = (() => { const ubuntuRunner = "ubuntu-22.04"; const ubuntuXlRunner = "ubuntu-22.04-xl"; + const windowsRunner = "windows-2022"; + const windowsXlRunner = "windows-2022-xl"; return { ubuntuXl: @@ -17,7 +19,9 @@ const Runners = (() => { ubuntu: ubuntuRunner, linux: ubuntuRunner, macos: "macos-12", - windows: "windows-2022", + windows: windowsRunner, + windowsXl: + `\${{ github.repository == 'denoland/deno' && '${windowsXlRunner}' || '${windowsRunner}' }}`, }; })(); const prCacheKeyPrefix = @@ -320,7 +324,7 @@ const ci = { job: "test", profile: "debug", }, { - os: Runners.windows, + os: Runners.windowsXl, job: "test", profile: "release", skip_pr: true, diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 86411c21cc..05170935b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,11 +67,11 @@ jobs: job: test profile: debug os_display_name: windows-x86_64 - - os: windows-2022 + - os: '${{ github.repository == ''denoland/deno'' && ''windows-2022-xl'' || ''windows-2022'' }}' job: test profile: release skip_pr: true - runner: '${{ github.event_name == ''pull_request'' && ''ubuntu-22.04'' || ''windows-2022'' }}' + runner: '${{ github.event_name == ''pull_request'' && ''ubuntu-22.04'' || github.repository == ''denoland/deno'' && ''windows-2022-xl'' || ''windows-2022'' }}' os_display_name: windows-x86_64 - os: '${{ github.repository == ''denoland/deno'' && ''ubuntu-22.04-xl'' || ''ubuntu-22.04'' }}' job: test