Skip to content

Commit 444c14d

Browse files
igagisigagis
committed
ci: arm gh runners
1 parent 4e0bd85 commit 444c14d

File tree

1 file changed

+20
-22
lines changed

1 file changed

+20
-22
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,11 @@ jobs:
7474
matrix:
7575
include:
7676
- {os: debian, codename: bookworm, image_owner: }
77-
- {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
77+
- {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
78+
- {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
7879
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
7980
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
80-
name: sanitizer - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }} - ${{ matrix.labels[0] }}
81+
name: sanitizer - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
8182
steps:
8283
- name: add cppfw deb repo
8384
uses: myci-actions/add-deb-repo@main
@@ -113,24 +114,24 @@ jobs:
113114
include:
114115
# - {os: debian, codename: buster, image_owner: }
115116
# - {os: debian, codename: buster, image_owner: i386/, labels: [i386,docker]}
116-
# - {os: debian, codename: buster, image_owner: arm32v7/, labels: [arm32,docker]}
117+
# - {os: debian, codename: buster, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
117118
# - {os: debian, codename: bullseye, image_owner: }
118119
# - {os: debian, codename: bullseye, image_owner: i386/, labels: [i386,docker]}
119-
# - {os: debian, codename: bullseye, image_owner: , labels: [arm32,docker]}
120-
# - {os: debian, codename: bullseye, image_owner: , labels: [arm64,docker]}
120+
# - {os: debian, codename: bullseye, image_owner: , labels: [ubuntu-24.04-arm]}
121+
# - {os: debian, codename: bullseye, image_owner: , labels: [ubuntu-24.04-arm]}
121122
- {os: debian, codename: bookworm, image_owner: }
122123
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
123-
- {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
124-
- {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
124+
- {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
125+
- {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
125126
# - {os: ubuntu, codename: focal, image_owner: }
126127
# - {os: ubuntu, codename: jammy, image_owner: }
127128
- {os: ubuntu, codename: noble, image_owner: }
128-
# - {os: raspbian, codename: buster, image_owner: igagis/, labels: [arm32,docker]}
129-
# - {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [arm32,docker]}
130-
- {os: raspbian, codename: bookworm, image_owner: igagis/, labels: [arm32,docker]}
129+
# - {os: raspbian, codename: buster, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
130+
# - {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
131+
- {os: raspbian, codename: bookworm, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
131132
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
132133
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
133-
name: linux - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }} - ${{ matrix.labels[0] }}
134+
name: linux - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
134135
steps:
135136
- name: set TZ for ubuntu:focal
136137
run: |
@@ -178,8 +179,8 @@ jobs:
178179
# matrix:
179180
# include:
180181
# - {image: "archlinux:latest", arch: amd64}
181-
# # - {image: "lopsided/archlinux-arm32v7:latest", arch: arm32, labels: [arm32,docker]}
182-
# - {image: "lopsided/archlinux-arm64v8:latest", arch: arm64, labels: [arm64,docker]}
182+
# # - {image: "lopsided/archlinux-arm32v7:latest", arch: arm32, labels: [ubuntu-24.04-arm]}
183+
# - {image: "lopsided/archlinux-arm64v8:latest", arch: arm64, labels: [ubuntu-24.04-arm]}
183184
# runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
184185
# container: ${{ matrix.image }}
185186
# name: linux - archlinux - ${{ matrix.arch }}
@@ -422,11 +423,11 @@ jobs:
422423
include:
423424
- {os: debian, codename: bookworm, image_owner: }
424425
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
425-
# - {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
426-
# - {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
426+
# - {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
427+
# - {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
427428
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
428429
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
429-
name: vcpkg - linux | ${{ matrix.labels[0] }}
430+
name: vcpkg - linux | ${{ matrix.image_owner }}
430431
steps:
431432
- name: add cppfw deb repo
432433
uses: myci-actions/add-deb-repo@main
@@ -474,11 +475,11 @@ jobs:
474475
include:
475476
- {os: debian, codename: bookworm, image_owner: }
476477
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
477-
- {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
478-
- {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
478+
# - {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
479+
- {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
479480
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
480481
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
481-
name: conan - linux | ${{ matrix.labels[0] }}
482+
name: conan - linux | ${{ matrix.image_owner }}
482483
steps:
483484
- name: add llvm repo (for clang-format)
484485
uses: myci-actions/add-deb-repo@main
@@ -580,9 +581,6 @@ jobs:
580581
include:
581582
# - {os: ubuntu, codename: noble, image_owner: }
582583
- {os: debian, codename: bookworm, image_owner: }
583-
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
584-
# - {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
585-
# - {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
586584
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
587585
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
588586
name: conan - emscripten | ${{ matrix.labels[0] }}

0 commit comments

Comments
 (0)