Skip to content

Commit 1314a74

Browse files
committed
github: use public arm runners
1 parent 9377ff6 commit 1314a74

File tree

1 file changed

+17
-20
lines changed

1 file changed

+17
-20
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,21 @@ jobs:
2121
include:
2222
# - {os: debian, codename: buster, image_owner: }
2323
# - {os: debian, codename: buster, image_owner: i386/, labels: [i386,docker]}
24-
# - {os: debian, codename: buster, image_owner: arm32v7/, labels: [arm32,docker]}
24+
# - {os: debian, codename: buster, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
2525
# - {os: debian, codename: bullseye, image_owner: }
2626
# - {os: debian, codename: bullseye, image_owner: i386/, labels: [i386,docker]}
27-
# - {os: debian, codename: bullseye, image_owner: arm32v7/, labels: [arm32,docker]}
28-
# - {os: debian, codename: bullseye, image_owner: arm64v8/, labels: [arm64,docker]}
27+
# - {os: debian, codename: bullseye, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
28+
# - {os: debian, codename: bullseye, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
2929
- {os: debian, codename: bookworm, image_owner: }
3030
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
31-
- {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [arm32,docker]}
32-
- {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [arm64,docker]}
31+
- {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
32+
- {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
3333
# - {os: ubuntu, codename: focal, image_owner: }
3434
# - {os: ubuntu, codename: jammy, image_owner: }
3535
- {os: ubuntu, codename: noble, image_owner: }
36-
# - {os: raspbian, codename: buster, image_owner: igagis/, labels: [arm32,docker]}
37-
# - {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [arm32,docker]}
38-
- {os: raspbian, codename: bookworm, image_owner: igagis/, labels: [arm32,docker]}
36+
# - {os: raspbian, codename: buster, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
37+
# - {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
38+
- {os: raspbian, codename: bookworm, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
3939
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
4040
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
4141
name: linux - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
@@ -74,8 +74,8 @@ jobs:
7474
# matrix:
7575
# include:
7676
# - {image: "archlinux:latest", arch: amd64}
77-
# # - {image: "lopsided/archlinux-arm32v7:latest", arch: arm32, labels: [arm32,docker]}
78-
# - {image: "lopsided/archlinux-arm64v8:latest", arch: arm64, labels: [arm64,docker]}
77+
# # - {image: "lopsided/archlinux-arm32v7:latest", arch: arm32, labels: [ubuntu-24.04-arm]}
78+
# - {image: "lopsided/archlinux-arm64v8:latest", arch: arm64, labels: [ubuntu-24.04-arm]}
7979
# runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
8080
# container: ${{ matrix.image }}
8181
# name: linux - archlinux - ${{ matrix.arch }}
@@ -312,11 +312,11 @@ jobs:
312312
include:
313313
- {os: debian, codename: bookworm, image_owner: }
314314
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
315-
# - {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
316-
# - {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
315+
# - {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
316+
# - {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
317317
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
318318
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
319-
name: vcpkg - linux | ${{ matrix.labels[0] }}
319+
name: vcpkg - linux | ${{ matrix.image_owner }}
320320
steps:
321321
- name: add cppfw deb repo
322322
uses: myci-actions/add-deb-repo@main
@@ -364,11 +364,11 @@ jobs:
364364
include:
365365
- {os: debian, codename: bookworm, image_owner: }
366366
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
367-
- {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
368-
- {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
367+
- {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
368+
- {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
369369
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
370370
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
371-
name: conan - linux | ${{ matrix.labels[0] }}
371+
name: conan - linux | ${{ matrix.image_owner }}
372372
steps:
373373
- name: clean
374374
uses: myci-actions/clean@main
@@ -460,12 +460,9 @@ jobs:
460460
include:
461461
# - {os: ubuntu, codename: noble, image_owner: }
462462
- {os: debian, codename: bookworm, image_owner: }
463-
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
464-
# - {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
465-
# - {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
466463
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
467464
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
468-
name: conan - emscripten | ${{ matrix.labels[0] }}
465+
name: conan - emscripten
469466
steps:
470467
- name: add cppfw deb repo
471468
uses: myci-actions/add-deb-repo@main

0 commit comments

Comments
 (0)