Skip to content

Commit 73c96f6

Browse files
mkannwischerhanno-becker
mkannwischer
authored and
hanno-becker
committed
CI: Switch from pqcp-arm64 to Github Arm runners
We are facing issues with pqcp-arm64 runners not picking up jobs. This commit switches to Github's Arm runners instead. Signed-off-by: Matthias J. Kannwischer <matthias@kannwischer.eu>
1 parent 2948ece commit 73c96f6

File tree

4 files changed

+33
-33
lines changed

4 files changed

+33
-33
lines changed

‎.github/workflows/base.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
system: [ubuntu-latest, pqcp-arm64]
17+
system: [ubuntu-latest, ubuntu-24.04-arm]
1818
name: Linting
1919
runs-on: ${{ matrix.system }}
2020
steps:
@@ -31,7 +31,7 @@ jobs:
3131
external:
3232
- ${{ github.repository_owner != 'pq-code-package' }}
3333
target:
34-
- runner: pqcp-arm64
34+
- runner: ubuntu-24.04-arm
3535
name: 'aarch64'
3636
- runner: ubuntu-latest
3737
name: 'x86_64'
@@ -42,7 +42,7 @@ jobs:
4242
exclude:
4343
- {external: true,
4444
target: {
45-
runner: pqcp-arm64,
45+
runner: ubuntu-24.04-arm,
4646
name: 'aarch64'
4747
}}
4848
name: Quickcheck (${{ matrix.target.name }})
@@ -65,15 +65,15 @@ jobs:
6565
external:
6666
- ${{ github.repository_owner != 'pq-code-package' }}
6767
target:
68-
- runner: pqcp-arm64
68+
- runner: ubuntu-24.04-arm
6969
name: 'aarch64'
7070
- runner: ubuntu-latest
7171
name: 'x86_64'
7272
acvp-version: [v1.1.0.39, v1.1.0.40, v1.1.0.41]
7373
exclude:
7474
- {external: true,
7575
target: {
76-
runner: pqcp-arm64,
76+
runner: ubuntu-24.04-arm,
7777
name: 'aarch64'
7878
}}
7979
name: Quickcheck ACVP (${{ matrix.target.name }}, ${{ matrix.acvp-version }})
@@ -90,9 +90,9 @@ jobs:
9090
external:
9191
- ${{ github.repository_owner != 'pq-code-package' }}
9292
target:
93-
- runner: pqcp-arm64
93+
- runner: ubuntu-24.04-arm
9494
name: 'aarch64'
95-
- runner: pqcp-arm64
95+
- runner: ubuntu-24.04-arm
9696
name: 'aarch64'
9797
- runner: ubuntu-latest
9898
name: 'x86_64'
@@ -103,7 +103,7 @@ jobs:
103103
exclude:
104104
- {external: true,
105105
target: {
106-
runner: pqcp-arm64,
106+
runner: ubuntu-24.04-arm,
107107
name: 'aarch64'
108108
}}
109109
name: Quickcheck bench (${{ matrix.target.name }})
@@ -139,14 +139,14 @@ jobs:
139139
external:
140140
- ${{ github.repository_owner != 'pq-code-package' }}
141141
target:
142-
- runner: pqcp-arm64
142+
- runner: ubuntu-24.04-arm
143143
name: 'aarch64'
144144
- runner: ubuntu-latest
145145
name: 'x86_64'
146146
exclude:
147147
- {external: true,
148148
target: {
149-
runner: pqcp-arm64,
149+
runner: ubuntu-24.04-arm,
150150
name: 'aarch64'
151151
}}
152152
name: Quickcheck C90 (${{ matrix.target.name }})
@@ -207,7 +207,7 @@ jobs:
207207
name: Quickcheck lib
208208
strategy:
209209
matrix:
210-
system: [macos-latest, macos-15-intel, ubuntu-latest, pqcp-arm64]
210+
system: [macos-latest, macos-15-intel, ubuntu-latest, ubuntu-24.04-arm]
211211
runs-on: ${{ matrix.system }}
212212
steps:
213213
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -228,7 +228,7 @@ jobs:
228228
name: Simplified
229229
- arg: '--no-simplify'
230230
name: Unmodified
231-
runs-on: pqcp-arm64
231+
runs-on: ubuntu-24.04-arm
232232
name: AArch64 dev backend (${{ matrix.simplify.name }})
233233
steps:
234234
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -262,7 +262,7 @@ jobs:
262262
external:
263263
- ${{ github.repository_owner != 'pq-code-package' }}
264264
target:
265-
- runner: pqcp-arm64
265+
- runner: ubuntu-24.04-arm
266266
name: 'aarch64'
267267
- runner: ubuntu-latest
268268
name: 'x86_64'

‎.github/workflows/ci.yml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,27 @@ jobs:
2727
arch: mac
2828
mode: native
2929
nix_shell: ci
30-
- runner: pqcp-arm64
30+
- runner: ubuntu-24.04-arm
3131
name: 'ubuntu-latest (aarch64)'
3232
arch: aarch64
3333
mode: native
3434
nix_shell: ci
35-
- runner: pqcp-arm64
35+
- runner: ubuntu-24.04-arm
3636
name: 'ubuntu-latest (aarch64)'
3737
arch: x86_64
3838
mode: cross-x86_64
3939
nix_shell: ci-cross-x86_64
40-
- runner: pqcp-arm64
40+
- runner: ubuntu-24.04-arm
4141
name: 'ubuntu-latest (aarch64)'
4242
arch: riscv64
4343
mode: cross-riscv64
4444
nix_shell: ci-cross-riscv64
45-
- runner: pqcp-arm64
45+
- runner: ubuntu-24.04-arm
4646
name: 'ubuntu-latest (aarch64)'
4747
arch: riscv32
4848
mode: cross-riscv32
4949
nix_shell: ci-cross-riscv32
50-
- runner: pqcp-arm64
50+
- runner: ubuntu-24.04-arm
5151
name: 'ubuntu-latest (ppc64le)'
5252
arch: ppc64le
5353
mode: cross-ppc64le
@@ -70,39 +70,39 @@ jobs:
7070
exclude:
7171
- {external: true,
7272
target: {
73-
runner: pqcp-arm64,
73+
runner: ubuntu-24.04-arm,
7474
name: 'ubuntu-latest (aarch64)',
7575
arch: aarch64,
7676
mode: native,
7777
nix_shell: ci
7878
}}
7979
- {external: true,
8080
target: {
81-
runner: pqcp-arm64,
81+
runner: ubuntu-24.04-arm,
8282
name: 'ubuntu-latest (aarch64)',
8383
arch: x86_64,
8484
mode: cross-x86_64,
8585
nix_shell: ci-cross-x86_64
8686
}}
8787
- {external: true,
8888
target: {
89-
runner: pqcp-arm64,
89+
runner: ubuntu-24.04-arm,
9090
name: 'ubuntu-latest (aarch64)',
9191
arch: riscv64,
9292
mode: cross-riscv64,
9393
nix_shell: ci-cross-riscv64
9494
}}
9595
- {external: true,
9696
target: {
97-
runner: pqcp-arm64,
97+
runner: ubuntu-24.04-arm,
9898
name: 'ubuntu-latest (aarch64)',
9999
arch: riscv32,
100100
mode: cross-riscv32,
101101
nix_shell: ci-cross-riscv32
102102
}}
103103
- {external: true,
104104
target: {
105-
runner: pqcp-arm64,
105+
runner: ubuntu-24.04-arm,
106106
name: 'ubuntu-latest (ppc64le)',
107107
arch: ppc64le,
108108
mode: cross-ppc64le,
@@ -203,7 +203,7 @@ jobs:
203203
matrix:
204204
cflags: [ "-O0", "-Os", "-O3" ]
205205
target:
206-
- runner: pqcp-arm64
206+
- runner: ubuntu-24.04-arm
207207
name: 'aarch64'
208208
- runner: ubuntu-latest
209209
name: 'x86_64'
@@ -415,7 +415,7 @@ jobs:
415415
target:
416416
- runner: pqcp-x64
417417
name: x86_64
418-
- runner: pqcp-arm64
418+
- runner: ubuntu-24.04-arm
419419
name: aarch64
420420
cflags: ['-O3', '-Os']
421421
exclude:
@@ -446,14 +446,14 @@ jobs:
446446
external:
447447
- ${{ github.repository_owner != 'pq-code-package' }}
448448
target:
449-
- runner: pqcp-arm64
449+
- runner: ubuntu-24.04-arm
450450
name: 'ubuntu-latest (aarch64)'
451451
- runner: pqcp-x64
452452
name: 'ubuntu-latest (x86_64)'
453453
exclude:
454454
- {external: true,
455455
target: {
456-
runner: pqcp-arm64,
456+
runner: ubuntu-24.04-arm,
457457
name: 'ubuntu-latest (aarch64)',
458458
}}
459459
- {external: true,
@@ -502,14 +502,14 @@ jobs:
502502
external:
503503
- ${{ github.repository_owner != 'pq-code-package' }}
504504
target:
505-
- runner: pqcp-arm64
505+
- runner: ubuntu-24.04-arm
506506
name: 'aarch64'
507507
- runner: ubuntu-latest
508508
name: 'x86_64'
509509
exclude:
510510
- {external: true,
511511
target: {
512-
runner: pqcp-arm64,
512+
runner: ubuntu-24.04-arm,
513513
name: 'aarch64'
514514
}}
515515
name: Check API consistency
@@ -722,7 +722,7 @@ jobs:
722722
strategy:
723723
fail-fast: false
724724
matrix:
725-
system: [ubuntu-latest, pqcp-arm64]
725+
system: [ubuntu-latest, ubuntu-24.04-arm]
726726
runs-on: ${{ matrix.system }}
727727
name: Check autogenerated files
728728
steps:

‎.github/workflows/ct-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
fail-fast: false
2020
max-parallel: 10
2121
matrix:
22-
system: [ubuntu-latest, pqcp-arm64]
22+
system: [ubuntu-latest, ubuntu-24.04-arm]
2323
nix-shell:
2424
- ci_valgrind-varlat_clang14
2525
- ci_valgrind-varlat_clang15

‎.github/workflows/integration-liboqs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
name: C
2727
flags: -DOQS_DIST_BUILD=OFF -DOQS_OPT_TARGET=generic -DCMAKE_BUILD_TYPE=Debug -DOQS_ENABLE_TEST_CONSTANT_TIME=ON
2828
# AArch64
29-
- system: pqcp-arm64
29+
- system: ubuntu-24.04-arm
3030
name: Auto
3131
flags: -DOQS_DIST_BUILD=OFF -DOQS_OPT_TARGET=auto -DCMAKE_BUILD_TYPE=Debug -DOQS_ENABLE_TEST_CONSTANT_TIME=ON
32-
- system: pqcp-arm64
32+
- system: ubuntu-24.04-arm
3333
name: C
3434
flags: -DOQS_DIST_BUILD=OFF -DOQS_OPT_TARGET=generic -DCMAKE_BUILD_TYPE=Debug -DOQS_ENABLE_TEST_CONSTANT_TIME=ON
3535
name: Build (${{ matrix.name }}, ${{ matrix.system }})

0 commit comments

Comments
 (0)