Skip to content

Commit 7d20a1d

Browse files
igagisigagis
committed
gha: use public arm runners
1 parent f0088ad commit 7d20a1d

1 file changed

Lines changed: 20 additions & 23 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ jobs:
7171
matrix:
7272
include:
7373
- {os: debian, codename: bookworm, image_owner: }
74-
- {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
75-
- {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
74+
- {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
75+
- {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
7676
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
7777
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
78-
name: sanitizer - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }} | ${{ matrix.labels[0] }}
78+
name: sanitizer - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
7979
steps:
8080
- name: add cppfw deb repo
8181
uses: myci-actions/add-deb-repo@main
@@ -111,24 +111,24 @@ jobs:
111111
include:
112112
# - {os: debian, codename: buster, image_owner: }
113113
# - {os: debian, codename: buster, image_owner: i386/, labels: [i386,docker]}
114-
# - {os: debian, codename: buster, image_owner: arm32v7/, labels: [arm32,docker]}
114+
# - {os: debian, codename: buster, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
115115
# - {os: debian, codename: bullseye, image_owner: }
116116
# - {os: debian, codename: bullseye, image_owner: i386/, labels: [i386,docker]}
117-
# - {os: debian, codename: bullseye, image_owner: , labels: [arm32,docker]}
118-
# - {os: debian, codename: bullseye, image_owner: , labels: [arm64,docker]}
117+
# - {os: debian, codename: bullseye, image_owner: , labels: [ubuntu-24.04-arm]}
118+
# - {os: debian, codename: bullseye, image_owner: , labels: [ubuntu-24.04-arm]}
119119
- {os: debian, codename: bookworm, image_owner: }
120120
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
121-
- {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
122-
- {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
121+
- {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
122+
- {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
123123
# - {os: ubuntu, codename: focal, image_owner: }
124124
# - {os: ubuntu, codename: jammy, image_owner: }
125125
- {os: ubuntu, codename: noble, image_owner: }
126-
# - {os: raspbian, codename: buster, image_owner: igagis/, labels: [arm32,docker]}
127-
# - {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [arm32,docker]}
128-
- {os: raspbian, codename: bookworm, image_owner: igagis/, labels: [arm32,docker]}
126+
# - {os: raspbian, codename: buster, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
127+
# - {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
128+
- {os: raspbian, codename: bookworm, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
129129
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
130130
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
131-
name: linux - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }} - ${{ matrix.labels[0] }}
131+
name: linux - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
132132
steps:
133133
- name: set TZ for ubuntu:focal
134134
run: |
@@ -171,7 +171,7 @@ jobs:
171171
# include:
172172
# - {image: "archlinux:latest", arch: amd64}
173173
# # - {image: "lopsided/archlinux-arm32v7:latest", arch: arm32, labels: [arm,docker]}
174-
# - {image: "lopsided/archlinux-arm64v8:latest", arch: arm64, labels: [arm64,docker]}
174+
# - {image: "lopsided/archlinux-arm64v8:latest", arch: arm64, labels: [ubuntu-24.04-arm]}
175175
# runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
176176
# container: ${{ matrix.image }}
177177
# name: linux - archlinux - ${{ matrix.arch }}
@@ -415,11 +415,11 @@ jobs:
415415
include:
416416
- {os: debian, codename: bookworm, image_owner: }
417417
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
418-
# - {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
419-
# - {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
418+
# - {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
419+
# - {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
420420
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
421421
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
422-
name: vcpkg - linux | ${{ matrix.labels[0] }}
422+
name: vcpkg - linux | ${{ matrix.image_owner }}
423423
steps:
424424
- name: add cppfw deb repo
425425
uses: myci-actions/add-deb-repo@main
@@ -467,11 +467,11 @@ jobs:
467467
include:
468468
- {os: debian, codename: bookworm, image_owner: }
469469
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
470-
- {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
471-
- {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
470+
- {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
471+
- {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
472472
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
473473
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
474-
name: conan - linux | ${{ matrix.labels[0] }}
474+
name: conan - linux | ${{ matrix.image_owner }}
475475
steps:
476476
- name: add llvm repo (for clang-format)
477477
uses: myci-actions/add-deb-repo@main
@@ -573,12 +573,9 @@ jobs:
573573
include:
574574
# - {os: ubuntu, codename: noble, image_owner: }
575575
- {os: debian, codename: bookworm, image_owner: }
576-
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
577-
# - {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
578-
# - {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
579576
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
580577
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
581-
name: conan - emscripten | ${{ matrix.labels[0] }}
578+
name: conan - emscripten | ${{ matrix.image_owner }}
582579
steps:
583580
- name: add cppfw deb repo
584581
uses: myci-actions/add-deb-repo@main

0 commit comments

Comments
 (0)