Skip to content

Commit d11a132

Browse files
committed
ci: Use zephyr-runner v2
This commit updates the CI workflows to use the next generation zephyr-runner v2 deployment. Signed-off-by: Stephanos Ioannidis <root@stephanos.io>
1 parent 0785d9e commit d11a132

File tree

2 files changed

+22
-16
lines changed

2 files changed

+22
-16
lines changed

.github/workflows/ci.yml

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ jobs:
229229
if [ "${build_host_linux_x86_64}" == "y" ]; then
230230
MATRIX_HOSTS+='{
231231
"name": "linux-x86_64",
232-
"runner": "zephyr-runner-linux-x64-4xlarge",
232+
"runner": "zephyr-runner-v2-linux-x64-4xlarge",
233233
"container": "ghcr.io/zephyrproject-rtos/sdk-build:v1.2.3",
234234
"archive": "tar.xz"
235235
},'
@@ -238,7 +238,7 @@ jobs:
238238
if [ "${build_host_linux_aarch64}" == "y" ]; then
239239
MATRIX_HOSTS+='{
240240
"name": "linux-aarch64",
241-
"runner": "zephyr-runner-linux-arm64-4xlarge",
241+
"runner": "zephyr-runner-v2-linux-arm64-4xlarge",
242242
"container": "ghcr.io/zephyrproject-rtos/sdk-build:v1.2.3",
243243
"archive": "tar.xz"
244244
},'
@@ -247,7 +247,7 @@ jobs:
247247
if [ "${build_host_macos_x86_64}" == "y" ]; then
248248
MATRIX_HOSTS+='{
249249
"name": "macos-x86_64",
250-
"runner": "zephyr-runner-macos-arm64-2xlarge",
250+
"runner": "zephyr-runner-v2-macos-arm64-2xlarge",
251251
"container": "",
252252
"archive": "tar.xz"
253253
},'
@@ -256,7 +256,7 @@ jobs:
256256
if [ "${build_host_macos_aarch64}" == "y" ]; then
257257
MATRIX_HOSTS+='{
258258
"name": "macos-aarch64",
259-
"runner": "zephyr-runner-macos-arm64-2xlarge",
259+
"runner": "zephyr-runner-v2-macos-arm64-2xlarge",
260260
"container": "",
261261
"archive": "tar.xz"
262262
},'
@@ -265,7 +265,7 @@ jobs:
265265
if [ "${build_host_windows_x86_64}" == "y" ]; then
266266
MATRIX_HOSTS+='{
267267
"name": "windows-x86_64",
268-
"runner": "zephyr-runner-linux-x64-4xlarge",
268+
"runner": "zephyr-runner-v2-linux-x64-4xlarge",
269269
"container": "ghcr.io/zephyrproject-rtos/sdk-build:v1.2.3",
270270
"archive": "7z"
271271
},'
@@ -306,7 +306,7 @@ jobs:
306306
if [ "${build_host_linux_x86_64}" == "y" ]; then
307307
MATRIX_TESTENVS+='{
308308
"name": "ubuntu-20.04-x86_64",
309-
"runner": "zephyr-runner-linux-x64-4xlarge",
309+
"runner": "zephyr-runner-v2-linux-x64-4xlarge",
310310
"container": "ghcr.io/zephyrproject-rtos/ci:master",
311311
"bundle-host": "linux-x86_64",
312312
"bundle-archive": "tar.xz"
@@ -316,7 +316,7 @@ jobs:
316316
if [ "${build_host_linux_aarch64}" == "y" ]; then
317317
MATRIX_TESTENVS+='{
318318
"name": "ubuntu-20.04-aarch64",
319-
"runner": "zephyr-runner-linux-arm64-4xlarge",
319+
"runner": "zephyr-runner-v2-linux-arm64-4xlarge",
320320
"container": "ghcr.io/zephyrproject-rtos/ci:master",
321321
"bundle-host": "linux-aarch64",
322322
"bundle-archive": "tar.xz"
@@ -326,7 +326,7 @@ jobs:
326326
if [ "${build_host_macos_x86_64}" == "y" ]; then
327327
MATRIX_TESTENVS+='{
328328
"name": "macos-11-x86_64",
329-
"runner": "zephyr-runner-macos-arm64-2xlarge",
329+
"runner": "zephyr-runner-v2-macos-arm64-2xlarge",
330330
"container": "",
331331
"bundle-host": "macos-x86_64",
332332
"bundle-archive": "tar.xz"
@@ -336,7 +336,7 @@ jobs:
336336
if [ "${build_host_macos_aarch64}" == "y" ]; then
337337
MATRIX_TESTENVS+='{
338338
"name": "macos-11-aarch64",
339-
"runner": "zephyr-runner-macos-arm64-2xlarge",
339+
"runner": "zephyr-runner-v2-macos-arm64-2xlarge",
340340
"container": "",
341341
"bundle-host": "macos-aarch64",
342342
"bundle-archive": "tar.xz"
@@ -346,7 +346,7 @@ jobs:
346346
if [ "${build_host_windows_x86_64}" == "y" ]; then
347347
MATRIX_TESTENVS+='{
348348
"name": "windows-2019-x86_64",
349-
"runner": "windows-2019-8c",
349+
"runner": "zephyr-runner-v2-windows-x64-2xlarge",
350350
"container": "",
351351
"bundle-host": "windows-x86_64",
352352
"bundle-archive": "7z"
@@ -401,7 +401,8 @@ jobs:
401401
build-toolchain:
402402
name: Toolchain ${{ matrix.target }} (${{ matrix.host.name }})
403403
needs: setup
404-
runs-on: ${{ matrix.host.runner }}
404+
runs-on:
405+
group: ${{ matrix.host.runner }}
405406
container: ${{ matrix.host.container }}
406407

407408
defaults:
@@ -822,7 +823,8 @@ jobs:
822823
build-hosttools:
823824
name: Host Tools (${{ matrix.host.name }})
824825
needs: setup
825-
runs-on: ${{ matrix.host.runner }}
826+
runs-on:
827+
group: ${{ matrix.host.runner }}
826828
container: ${{ matrix.host.container }}
827829

828830
defaults:
@@ -970,7 +972,8 @@ jobs:
970972
build-cmake-pkg:
971973
name: CMake Package (${{ matrix.host.name }})
972974
needs: setup
973-
runs-on: ${{ matrix.host.runner }}
975+
runs-on:
976+
group: ${{ matrix.host.runner }}
974977
container: ${{ matrix.host.container }}
975978

976979
defaults:
@@ -1059,7 +1062,8 @@ jobs:
10591062
build-dist-bundle:
10601063
name: Distribution Bundle (${{ matrix.host.name }})
10611064
needs: [ setup, build-toolchain, build-hosttools, build-cmake-pkg ]
1062-
runs-on: ${{ matrix.host.runner }}
1065+
runs-on:
1066+
group: ${{ matrix.host.runner }}
10631067
container: ${{ matrix.host.container }}
10641068

10651069
defaults:
@@ -1248,7 +1252,8 @@ jobs:
12481252
test-dist-bundle:
12491253
name: Test (${{ matrix.testenv.name }}) Subset ${{ matrix.subset }}
12501254
needs: [ setup, build-dist-bundle ]
1251-
runs-on: ${{ matrix.testenv.runner }}
1255+
runs-on:
1256+
group: ${{ matrix.testenv.runner }}
12521257
container: ${{ matrix.testenv.container }}
12531258

12541259
defaults:

.github/workflows/release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ jobs:
2525
release:
2626
name: Release
2727
needs: [ ci ]
28-
runs-on: zephyr-runner-linux-x64-4xlarge
28+
runs-on:
29+
group: zephyr-runner-v2-linux-x64-4xlarge
2930

3031
steps:
3132
- name: Set up build environment

0 commit comments

Comments
 (0)