Skip to content

Commit c98ec75

Browse files
committed
fix(ci): use depot runners
1 parent 336162b commit c98ec75

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

nix/packages/github-matrix/github_matrix.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ class NixEvalError(TypedDict):
7070
BUILD_RUNNER_MAP: Dict[RunnerType, Dict[System, RunsOnConfig]] = {
7171
"ephemeral": {
7272
"aarch64-linux": {
73-
"labels": ["blacksmith-4vcpu-ubuntu-2404-arm"],
73+
"labels": ["depot-ubuntu-24.04-arm-8"],
7474
},
7575
"x86_64-linux": {
76-
"labels": ["blacksmith-8vcpu-ubuntu-2404"],
76+
"labels": ["depot-ubuntu-24.04-8"],
7777
},
7878
},
7979
"self-hosted": {
@@ -262,8 +262,8 @@ def get_runner_for_package(pkg: NixEvalJobsOutput) -> RunsOnConfig | None:
262262
return runConfig
263263

264264
if is_large_pkg(pkg) and system in ("x86_64-linux", "aarch64-linux"):
265-
suffix = "-arm" if system == "aarch64-linux" else ""
266-
return {"labels": [f"blacksmith-32vcpu-ubuntu-2404{suffix}"]}
265+
arch = "arm-" if system == "aarch64-linux" else ""
266+
return {"labels": [f"depot-ubuntu-24.04-{arch}32"]}
267267

268268
if system == "aarch64-darwin":
269269
return BUILD_RUNNER_MAP["self-hosted"]["aarch64-darwin"]

nix/packages/github-matrix/tests/test_github_matrix.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ def test_large_package_x86_64_linux(self):
142142
"requiredSystemFeatures": ["big-parallel"],
143143
}
144144
result = get_runner_for_package(pkg)
145-
assert result == {"labels": ["blacksmith-32vcpu-ubuntu-2404"]}
145+
assert result == {"labels": ["depot-ubuntu-24.04-32"]}
146146

147147
def test_large_package_aarch64_linux(self):
148148
pkg: NixEvalJobsOutput = {
@@ -161,7 +161,7 @@ def test_large_package_aarch64_linux(self):
161161
"requiredSystemFeatures": ["big-parallel"],
162162
}
163163
result = get_runner_for_package(pkg)
164-
assert result == {"labels": ["blacksmith-32vcpu-ubuntu-2404-arm"]}
164+
assert result == {"labels": ["depot-ubuntu-24.04-arm-32"]}
165165

166166
def test_darwin_package(self):
167167
pkg: NixEvalJobsOutput = {
@@ -194,7 +194,7 @@ def test_default_x86_64_linux(self):
194194
"system": "x86_64-linux",
195195
}
196196
result = get_runner_for_package(pkg)
197-
assert result == {"labels": ["blacksmith-8vcpu-ubuntu-2404"]}
197+
assert result == {"labels": ["depot-ubuntu-24.04-8"]}
198198

199199
def test_default_aarch64_linux(self):
200200
pkg: NixEvalJobsOutput = {
@@ -212,7 +212,7 @@ def test_default_aarch64_linux(self):
212212
"system": "aarch64-linux",
213213
}
214214
result = get_runner_for_package(pkg)
215-
assert result == {"labels": ["blacksmith-4vcpu-ubuntu-2404-arm"]}
215+
assert result == {"labels": ["depot-ubuntu-24.04-arm-8"]}
216216

217217

218218
class TestSortPkgsByClosures:

0 commit comments

Comments
 (0)