Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

Right-size macOS PR runners (#64923)

Piotr Osiewicz9307bb7dc5bd
diff --git a/.github/actionlint.yml b/.github/actionlint.yml
index bf60d2b8d8c..fc1ba2c67ff 100644
--- a/.github/actionlint.yml
+++ b/.github/actionlint.yml
@@ -32,6 +32,7 @@ self-hosted-runner:
- namespace-profile-8x32-ubuntu-2004-arm-m4
# Namespace mac
- namespace-profile-mac-large
+ - namespace-profile-mac-small
# Self Hosted Runners
- self-mini-macos
- self-32vcpu-windows-2022
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 585280568f5..b87f1858eb9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -164,7 +164,7 @@ jobs:
timeout-minutes: 60
clippy_mac:
if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
- runs-on: namespace-profile-mac-large
+ runs-on: namespace-profile-mac-small
steps:
- name: steps::checkout_repo
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index 90825a48c0d..33ba105dec0 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -265,7 +265,7 @@ jobs:
- orchestrate
- check_style
if: needs.orchestrate.outputs.run_tests == 'true' && github.event_name != 'merge_group'
- runs-on: namespace-profile-mac-large
+ runs-on: namespace-profile-mac-small
steps:
- name: steps::checkout_repo
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
@@ -297,7 +297,7 @@ jobs:
- orchestrate
- check_style
if: needs.orchestrate.outputs.run_tests == 'true' && github.event_name != 'merge_group'
- runs-on: namespace-profile-mac-large
+ runs-on: namespace-profile-mac-small
steps:
- name: steps::checkout_repo
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
@@ -628,7 +628,7 @@ jobs:
- orchestrate
- check_style
if: needs.orchestrate.outputs.run_tests == 'true' && github.event_name != 'merge_group'
- runs-on: namespace-profile-mac-large
+ runs-on: namespace-profile-mac-small
steps:
- name: steps::checkout_repo
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
@@ -906,7 +906,7 @@ jobs:
- orchestrate
- check_style
if: needs.orchestrate.outputs.run_tests == 'true' && github.event_name != 'merge_group'
- runs-on: namespace-profile-mac-large
+ runs-on: namespace-profile-mac-small
steps:
- name: steps::checkout_repo
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
diff --git a/tooling/xtask/src/tasks/workflows/run_tests.rs b/tooling/xtask/src/tasks/workflows/run_tests.rs
index 02a585d8138..ca9c87c3d09 100644
--- a/tooling/xtask/src/tasks/workflows/run_tests.rs
+++ b/tooling/xtask/src/tasks/workflows/run_tests.rs
@@ -545,7 +545,7 @@ fn check_remote_server(platform: Platform, arch: Arch) -> NamedJob {
let runner = match (platform, arch) {
(Platform::Linux, Arch::X86_64) => runners::LINUX_LARGE,
(Platform::Linux, Arch::AARCH64) => runners::LINUX_ARM_BUNDLER,
- (Platform::Mac, _) => runners::MAC_DEFAULT,
+ (Platform::Mac, _) => runners::MAC_SMALL,
(Platform::Windows, _) => runners::WINDOWS_DEFAULT,
};
let command = format!(
@@ -628,7 +628,7 @@ pub(crate) fn clippy(platform: Platform, arch: Option<Arch>, harden: bool) -> Na
let runner = match platform {
Platform::Windows => runners::WINDOWS_DEFAULT,
Platform::Linux => runners::LINUX_DEFAULT,
- Platform::Mac => runners::MAC_DEFAULT,
+ Platform::Mac => runners::MAC_SMALL,
};
let mut job = release_job(&[])
.runs_on(runner)
@@ -741,7 +741,7 @@ fn build_visual_tests_binary() -> NamedJob {
named::job(
Job::default()
- .runs_on(runners::MAC_DEFAULT)
+ .runs_on(runners::MAC_SMALL)
.add_step(steps::checkout_repo())
.add_step(steps::setup_cargo_config(Platform::Mac))
.add_step(steps::cache_rust_dependencies_namespace())
diff --git a/tooling/xtask/src/tasks/workflows/runners.rs b/tooling/xtask/src/tasks/workflows/runners.rs
index 883298b915a..5785980572d 100644
--- a/tooling/xtask/src/tasks/workflows/runners.rs
+++ b/tooling/xtask/src/tasks/workflows/runners.rs
@@ -14,6 +14,7 @@ pub const LINUX_ARM_BUNDLER: Runner = Runner("namespace-profile-8x32-ubuntu-2004
pub const LINUX_LARGE_RAM: Runner = Runner("namespace-profile-8x32-ubuntu-2404");
pub const MAC_DEFAULT: Runner = Runner("namespace-profile-mac-large");
+pub const MAC_SMALL: Runner = Runner("namespace-profile-mac-small");
pub const WINDOWS_DEFAULT: Runner = Runner("self-32vcpu-windows-2022");
pub struct Runner(&'static str);