Switch to newer MacOS GitHub runner (#11345)

- MacOS13 (as 12 is deprecated) and 14/15 need to be large instances if we want x64.

Build seemed fine except for usual playwright fails.
This commit is contained in:
James Dunkerley 2024-10-17 14:13:32 +01:00 committed by GitHub
parent e7bc796fe5
commit fb8c4922eb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 13 additions and 17 deletions

View File

@ -107,7 +107,7 @@ jobs:
enso-build-ci-gen-job-ci-check-backend-graal-vm-ce-macos-amd64:
name: Engine (GraalVM CE) (macos, amd64)
runs-on:
- macos-12
- macos-13
steps:
- if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
name: Installing wasm-pack
@ -354,7 +354,7 @@ jobs:
enso-build-ci-gen-job-jvm-tests-graal-vm-ce-macos-amd64:
name: JVM Tests (GraalVM CE) (macos, amd64)
runs-on:
- macos-12
- macos-13
steps:
- if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
name: Installing wasm-pack
@ -640,7 +640,7 @@ jobs:
enso-build-ci-gen-job-standard-library-tests-graal-vm-ce-macos-amd64:
name: Standard Library Tests (GraalVM CE) (macos, amd64)
runs-on:
- macos-12
- macos-13
steps:
- if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
name: Installing wasm-pack

View File

@ -39,7 +39,7 @@ jobs:
target/lib/**
build_mac_intel_parser:
runs-on: macos-12
runs-on: macos-13
steps:
- uses: actions/checkout@v4

View File

@ -61,7 +61,7 @@ jobs:
enso-build-ci-gen-job-build-backend-macos-amd64:
name: Build Backend (macos, amd64)
runs-on:
- macos-12
- macos-13
steps:
- if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
name: Installing wasm-pack
@ -213,7 +213,7 @@ jobs:
enso-build-ci-gen-job-gui-build-macos-amd64:
name: GUI build (macos, amd64)
runs-on:
- macos-12
- macos-13
steps:
- if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
name: Installing wasm-pack
@ -391,7 +391,7 @@ jobs:
needs:
- enso-build-ci-gen-job-build-backend-macos-amd64
runs-on:
- macos-12
- macos-13
steps:
- if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
name: Installing wasm-pack

View File

@ -202,7 +202,7 @@ jobs:
needs:
- enso-build-ci-gen-draft-release-linux-amd64
runs-on:
- macos-12
- macos-13
steps:
- if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
name: Installing wasm-pack
@ -484,7 +484,7 @@ jobs:
- enso-build-ci-gen-draft-release-linux-amd64
- enso-build-ci-gen-job-upload-backend-macos-amd64
runs-on:
- macos-12
- macos-13
steps:
- if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
name: Installing wasm-pack

View File

@ -75,7 +75,7 @@ jobs:
enso-build-ci-gen-job-ci-check-backend-graal-vm-ce-macos-amd64:
name: Engine (GraalVM CE) (macos, amd64)
runs-on:
- macos-12
- macos-13
steps:
- if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
name: Installing wasm-pack
@ -220,7 +220,7 @@ jobs:
enso-build-ci-gen-job-jvm-tests-graal-vm-ce-macos-amd64:
name: JVM Tests (GraalVM CE) (macos, amd64)
runs-on:
- macos-12
- macos-13
steps:
- if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
name: Installing wasm-pack
@ -390,7 +390,7 @@ jobs:
enso-build-ci-gen-job-standard-library-tests-graal-vm-ce-macos-amd64:
name: Standard Library Tests (GraalVM CE) (macos, amd64)
runs-on:
- macos-12
- macos-13
steps:
- if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
name: Installing wasm-pack

View File

@ -58,7 +58,6 @@ 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()),
@ -87,7 +86,7 @@ impl RunsOn for OS {
impl RunsOn for (OS, Arch) {
fn runs_on(&self) -> Vec<RunnerLabel> {
match self {
(OS::MacOS, Arch::X86_64) => vec![RunnerLabel::MacOS12],
(OS::MacOS, Arch::X86_64) => vec![RunnerLabel::MacOS13],
(os, Arch::X86_64) => runs_on(*os, RunnerType::SelfHosted),
(OS::MacOS, Arch::AArch64) => {
let mut ret = runs_on(OS::MacOS, RunnerType::SelfHosted);

View File

@ -1014,9 +1014,6 @@ 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")]