Skip to content

Commit cb30eaf

Browse files
committed
Switched to Github Action native ARM runners
1 parent ea1c59e commit cb30eaf

File tree

2 files changed

+66
-38
lines changed

2 files changed

+66
-38
lines changed

Diff for: .github/workflows/push-master.yml

+43-29
Original file line numberDiff line numberDiff line change
@@ -18,58 +18,72 @@ jobs:
1818

1919
Linux:
2020
name: ${{ matrix.dockerName }}
21-
runs-on: ubuntu-22.04
22-
21+
runs-on: ${{ matrix.runner }}
2322
strategy:
2423
matrix:
25-
linuxVersion: [ bullseye ]
26-
dockerImage: [ x86_64, arm-32bit-armv6l, arm-64bit-aarch64 ]
27-
include:
28-
- dockerImage: x86_64
24+
include:
25+
- runner: ubuntu-24.04
26+
dockerImage: x86_64
2927
linuxVersion: bullseye
3028
dockerName: Debian Bullseye (x86_64)
3129
platform: linux
32-
- dockerImage: x86_64
30+
- runner: ubuntu-24.04
31+
dockerImage: x86_64
3332
linuxVersion: bookworm
3433
dockerName: Debian Bookworm (x86_64)
3534
platform: linux
36-
- dockerImage: x86_64
35+
- runner: ubuntu-24.04
36+
dockerImage: x86_64
3737
linuxVersion: jammy
3838
dockerName: Ubuntu 22.04 LTS (x86_64)
3939
platform: linux
40-
- dockerImage: x86_64
40+
- runner: ubuntu-24.04
41+
dockerImage: x86_64
4142
linuxVersion: noble
4243
dockerName: Ubuntu 24.04 LTS (x86_64)
4344
platform: linux
44-
- dockerImage: x86_64
45+
- runner: ubuntu-24.04
46+
dockerImage: x86_64
4547
linuxVersion: oracular
4648
dockerName: Ubuntu 24.10 (x86_64)
47-
platform: linux
48-
- dockerImage: arm-32bit-armv6l
49+
platform: linux
50+
- runner: ubuntu-24.04
51+
dockerImage: x86_64
52+
linuxVersion: Fedora_41
53+
dockerName: Fedora 41 (x86_64)
54+
platform: linux
55+
- runner: ubuntu-24.04
56+
dockerImage: x86_64
57+
linuxVersion: ArchLinux
58+
dockerName: Arch Linux (x86_64)
59+
platform: linux
60+
- runner: ubuntu-24.04-arm
61+
dockerImage: arm-32bit-armv6l-native
4962
linuxVersion: bullseye
50-
dockerName: Debian Bullseye (ARM 32-bit Raspberry Pi OS)
63+
dockerName: Debian Bullseye (native ARM 32-bit Raspberry Pi OS)
5164
platform: rpi
52-
- dockerImage: arm-64bit-aarch64
65+
- runner: ubuntu-24.04-arm
66+
dockerImage: arm-64bit-aarch64-native
5367
linuxVersion: bullseye
54-
dockerName: Debian Bullseye (ARM 64-bit Raspberry Pi OS)
68+
dockerName: Debian Bullseye (native ARM 64-bit Raspberry Pi OS)
5569
platform: rpi
56-
- dockerImage: arm-32bit-armv6l
70+
- runner: ubuntu-24.04-arm
71+
dockerImage: arm-32bit-armv6l-native
5772
linuxVersion: bookworm
58-
dockerName: Debian Bookworm (ARM 32-bit Raspberry Pi OS)
73+
dockerName: Debian Bookworm (native ARM 32-bit Raspberry Pi OS)
5974
platform: rpi
60-
- dockerImage: arm-64bit-aarch64
75+
- runner: ubuntu-24.04-arm
76+
dockerImage: arm-64bit-aarch64-native
6177
linuxVersion: bookworm
62-
dockerName: Debian Bookworm (ARM 64-bit Raspberry Pi OS)
63-
platform: rpi
64-
- dockerImage: x86_64
65-
linuxVersion: Fedora_41
66-
dockerName: Fedora 41 (x86_64)
67-
platform: linux
68-
- dockerImage: x86_64
69-
linuxVersion: ArchLinux
70-
dockerName: Arch Linux (x86_64)
71-
platform: linux
78+
dockerName: Debian Bookworm (native ARM 64-bit Raspberry Pi OS)
79+
platform: rpi
7280
steps:
81+
# start docker
82+
- name: Wake-up docker
83+
if: matrix.runner == 'ubuntu-24.04-arm'
84+
run: |
85+
sudo systemctl start docker
86+
7387
# checkout
7488
- uses: actions/[email protected]
7589
with:
@@ -326,7 +340,7 @@ jobs:
326340

327341
analyze:
328342
name: Analyze (CodeQL)
329-
runs-on: ubuntu-latest
343+
runs-on: ubuntu-24.04
330344
if: ${{ vars.USE_CODEQL == 'true' && vars.USE_CODEQL || false }}
331345

332346
permissions:

Diff for: .github/workflows/upload-to-github-pages.yml

+23-9
Original file line numberDiff line numberDiff line change
@@ -15,58 +15,72 @@ jobs:
1515
######################################
1616
Linux:
1717
name: ${{ matrix.niceName }} ${{ matrix.linuxVersion }} (${{ matrix.arch }})
18-
runs-on: ubuntu-22.04
18+
runs-on: ${{ matrix.runner }}
1919

2020
strategy:
2121
matrix:
2222
niceName: [ Debian ]
2323
linuxVersion: [ bullseye, bookworm ]
2424
dockerImage: [ x86_64, arm-32bit-armv6l, arm-64bit-aarch64 ]
2525
include:
26-
- dockerImage: x86_64
26+
- runner: ubuntu-24.04
27+
dockerImage: x86_64
2728
dockerName: Debian (amd64)
2829
arch: amd64
2930
platform: linux
30-
- dockerImage: arm-32bit-armv6l
31+
- runner: ubuntu-24.04-arm
32+
dockerImage: arm-32bit-armv6l-native
3133
dockerName: Debian (armhf)
3234
arch: armhf
3335
platform: rpi
34-
- dockerImage: arm-64bit-aarch64
36+
- runner: ubuntu-24.04-arm
37+
dockerImage: arm-64bit-aarch64-native
3538
dockerName: Debian (arm64)
3639
arch: arm64
3740
platform: rpi
38-
- dockerImage: x86_64
41+
- runner: ubuntu-24.04
42+
dockerImage: x86_64
3943
linuxVersion: ArchLinux
4044
dockerName: Arch Linux (x86_64)
4145
arch: amd64
4246
platform: linux
4347
niceName: ""
44-
- dockerImage: x86_64
48+
- runner: ubuntu-24.04
49+
dockerImage: x86_64
4550
linuxVersion: jammy
4651
dockerName: Ubuntu 22.04 LTS (x86_64)
4752
arch: amd64
4853
platform: linux
4954
niceName: Ubuntu 22.04 LTS
50-
- dockerImage: x86_64
55+
- runner: ubuntu-24.04
56+
dockerImage: x86_64
5157
linuxVersion: noble
5258
dockerName: Ubuntu 24.04 LTS (x86_64)
5359
arch: amd64
5460
platform: linux
5561
niceName: Ubuntu 24.04 LTS
56-
- dockerImage: x86_64
62+
- runner: ubuntu-24.04
63+
dockerImage: x86_64
5764
linuxVersion: oracular
5865
dockerName: Ubuntu 24.10 (x86_64)
5966
arch: amd64
6067
platform: linux
6168
niceName: Ubuntu 24.10
62-
- dockerImage: x86_64
69+
- runner: ubuntu-24.04
70+
dockerImage: x86_64
6371
linuxVersion: Fedora_41
6472
dockerName: Fedora 41 (x86_64)
6573
arch: amd64
6674
platform: linux
6775
niceName: Fedora 41
6876

6977
steps:
78+
# start docker
79+
- name: Wake-up docker
80+
if: matrix.runner == 'ubuntu-24.04-arm'
81+
run: |
82+
sudo systemctl start docker
83+
7084
# checkout
7185
- uses: actions/[email protected]
7286
with:

0 commit comments

Comments
 (0)