diff options
| author | Bartek Iwańczuk <biwanczuk@gmail.com> | 2024-10-19 01:42:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-19 00:42:54 +0000 |
| commit | d1cd1fafa4f09b215a9ce2eb330dc810a6635afd (patch) | |
| tree | e561111af48aa922fe6e931ecad7243bebf977b2 /.github | |
| parent | 2c3900370ac3e0b62f1e0dfb86a883c75952146d (diff) | |
Revert "ci: use self-hosted mac arm runner (#26366)" (#26408)
This reverts commit e22d0e91ef7ce17dca299a44d1ccd292abde34f2.
Reverting because the CI pipeline is actually incorrect.
I intended to only use this self-hosted runner for "release" builds on
`main` branch, but now all PRs are queued waiting for a runner for a "debug"
build.
Diffstat (limited to '.github')
| -rwxr-xr-x | .github/workflows/ci.generate.ts | 3 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts index ab0b54bde..98272abe4 100755 --- a/.github/workflows/ci.generate.ts +++ b/.github/workflows/ci.generate.ts @@ -40,8 +40,7 @@ const Runners = { macosArm: { os: "macos", arch: "aarch64", - runner: - `\${{ github.repository == 'denoland/deno' && 'self-hosted' || '${macosArmRunner}' }}`, + runner: macosArmRunner, }, windowsX86: { os: "windows", diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 63c14de4a..161b8719c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,12 +68,12 @@ jobs: skip: '${{ !contains(github.event.pull_request.labels.*.name, ''ci-full'') && (github.event_name == ''pull_request'') }}' - os: macos arch: aarch64 - runner: '${{ github.repository == ''denoland/deno'' && ''self-hosted'' || ''macos-14'' }}' + runner: macos-14 job: test 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'' && ''self-hosted'' || ''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'') }}' |