Skip to content

Commit

Permalink
Use macos-12 runner for x64 macOS jobs (#9801)
Browse files Browse the repository at this point in the history
GitHub made arm64 runners generally available and changed macos-latest label to point to them.
The runner architecture is coupled with GH-hosted runners OS version: macos-13 is the last one to run on x64.

This PR essentially brings back the previous behavior, by explicitly requesting that all our x64 macOS jobs are run on macos-12 (as was before). 
We should eventually migrate to macos-13 for x64 macOS and macos-14/macos-latest for arm64 macOS. However, this leads to issues with `npm install` getting stuck, so it should be probably reattempted after the CI rework.
  • Loading branch information
mwu-tow authored Apr 29, 2024
1 parent 8e03e3b commit 447f4b5
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/engine-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
enso-build-ci-gen-job-ci-check-backend-graal-vm-ce-macos-x86_64:
name: Engine (GraalVM CE) (macos, x86_64)
runs-on:
- macos-latest
- macos-12
steps:
- if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
name: Installing wasm-pack
Expand Down Expand Up @@ -354,7 +354,7 @@ jobs:
enso-build-ci-gen-job-jvm-tests-graal-vm-ce-macos-x86_64:
name: JVM Tests (GraalVM CE) (macos, x86_64)
runs-on:
- macos-latest
- macos-12
steps:
- if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
name: Installing wasm-pack
Expand Down Expand Up @@ -640,7 +640,7 @@ jobs:
enso-build-ci-gen-job-standard-library-tests-graal-vm-ce-macos-x86_64:
name: Standard Library Tests (GraalVM CE) (macos, x86_64)
runs-on:
- macos-latest
- macos-12
steps:
- if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
name: Installing wasm-pack
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/gui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
enso-build-ci-gen-job-build-backend-macos-x86_64:
name: Build Backend (macos, x86_64)
runs-on:
- macos-latest
- macos-12
steps:
- if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
name: Installing wasm-pack
Expand Down Expand Up @@ -214,7 +214,7 @@ jobs:
enso-build-ci-gen-job-new-gui-build-macos-x86_64:
name: GUI build (macos, x86_64)
runs-on:
- macos-latest
- macos-12
steps:
- if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
name: Installing wasm-pack
Expand Down Expand Up @@ -385,7 +385,7 @@ jobs:
needs:
- enso-build-ci-gen-job-build-backend-macos-x86_64
runs-on:
- macos-latest
- macos-12
steps:
- if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
name: Installing wasm-pack
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ jobs:
needs:
- enso-build-ci-gen-draft-release-linux-x86_64
runs-on:
- macos-latest
- macos-12
steps:
- if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
name: Installing wasm-pack
Expand Down Expand Up @@ -492,7 +492,7 @@ jobs:
- enso-build-ci-gen-draft-release-linux-x86_64
- enso-build-ci-gen-job-upload-backend-macos-x86_64
runs-on:
- macos-latest
- macos-12
steps:
- if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
name: Installing wasm-pack
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/scala-new.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
enso-build-ci-gen-job-ci-check-backend-graal-vm-ce-macos-x86_64:
name: Engine (GraalVM CE) (macos, x86_64)
runs-on:
- macos-latest
- macos-12
steps:
- if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
name: Installing wasm-pack
Expand Down Expand Up @@ -220,7 +220,7 @@ jobs:
enso-build-ci-gen-job-jvm-tests-graal-vm-ce-macos-x86_64:
name: JVM Tests (GraalVM CE) (macos, x86_64)
runs-on:
- macos-latest
- macos-12
steps:
- if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
name: Installing wasm-pack
Expand Down Expand Up @@ -390,7 +390,7 @@ jobs:
enso-build-ci-gen-job-standard-library-tests-graal-vm-ce-macos-x86_64:
name: Standard Library Tests (GraalVM CE) (macos, x86_64)
runs-on:
- macos-latest
- macos-12
steps:
- if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
name: Installing wasm-pack
Expand Down
4 changes: 3 additions & 1 deletion build/build/src/ci_gen/job.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ impl RunsOn for RunnerLabel {
RunnerLabel::MacOS => Some("MacOS".to_string()),
RunnerLabel::Linux => Some("Linux".to_string()),
RunnerLabel::Windows => Some("Windows".to_string()),
RunnerLabel::MacOS12 => Some("MacOS12".to_string()),
RunnerLabel::MacOS13 => Some("MacOS13".to_string()),
RunnerLabel::MacOSLatest => Some("MacOSLatest".to_string()),
RunnerLabel::LinuxLatest => Some("LinuxLatest".to_string()),
RunnerLabel::WindowsLatest => Some("WindowsLatest".to_string()),
Expand Down Expand Up @@ -93,7 +95,7 @@ impl RunsOn for OS {
impl RunsOn for (OS, Arch) {
fn runs_on(&self) -> Vec<RunnerLabel> {
match self {
(OS::MacOS, Arch::X86_64) => runs_on(OS::MacOS, RunnerType::GitHubHosted),
(OS::MacOS, Arch::X86_64) => vec![RunnerLabel::MacOS12],
(os, Arch::X86_64) => runs_on(*os, RunnerType::SelfHosted),
(OS::MacOS, Arch::AArch64) => {
let mut ret = runs_on(OS::MacOS, RunnerType::SelfHosted);
Expand Down
5 changes: 5 additions & 0 deletions build/ci_utils/src/actions/workflow/definition.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1014,6 +1014,11 @@ pub enum RunnerLabel {
Windows,
#[serde(rename = "engine")]
Engine,
#[serde(rename = "macos-12")]
MacOS12,
/// macos-13 is the last x64 version of the GitHub-hosted macOS runner.
#[serde(rename = "macos-13")]
MacOS13,
#[serde(rename = "macos-latest")]
MacOSLatest,
#[serde(rename = "ubuntu-latest")]
Expand Down

0 comments on commit 447f4b5

Please sign in to comment.