Skip to content

Commit 252023d

Browse files
hanno-beckerhanno-becker
authored
Merge branch 'main' into structured
2 parents 1b406c3 + 403daac commit 252023d

File tree

10 files changed

+120
-57
lines changed

10 files changed

+120
-57
lines changed

‎.github/actions/cbmc/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@ runs:
5353
shell: ${{ env.SHELL }}
5454
run: |
5555
echo "::group::cbmc_${{ inputs.mlkem_k }}"
56-
tests cbmc --k ${{ inputs.mlkem_k }};
56+
tests cbmc --k ${{ inputs.mlkem_k }} --per-proof-timeout 1800;
5757
echo "::endgroup::"

‎.github/workflows/base.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
system: [ubuntu-latest, pqcp-arm64]
16+
system: [ubuntu-latest, ubuntu-24.04-arm]
1717
name: Linting
1818
runs-on: ${{ matrix.system }}
1919
steps:
@@ -30,7 +30,7 @@ jobs:
3030
external:
3131
- ${{ github.repository_owner != 'pq-code-package' }}
3232
target:
33-
- runner: pqcp-arm64
33+
- runner: ubuntu-24.04-arm
3434
name: 'aarch64'
3535
- runner: ubuntu-latest
3636
name: 'x86_64'
@@ -41,7 +41,7 @@ jobs:
4141
exclude:
4242
- {external: true,
4343
target: {
44-
runner: pqcp-arm64,
44+
runner: ubuntu-24.04-arm,
4545
name: 'aarch64'
4646
}}
4747
name: Quickcheck (${{ matrix.target.name }})
@@ -64,15 +64,15 @@ jobs:
6464
external:
6565
- ${{ github.repository_owner != 'pq-code-package' }}
6666
target:
67-
- runner: pqcp-arm64
67+
- runner: ubuntu-24.04-arm
6868
name: 'aarch64'
6969
- runner: ubuntu-latest
7070
name: 'x86_64'
7171
acvp-version: [v1.1.0.39, v1.1.0.40, v1.1.0.41]
7272
exclude:
7373
- {external: true,
7474
target: {
75-
runner: pqcp-arm64,
75+
runner: ubuntu-24.04-arm,
7676
name: 'aarch64'
7777
}}
7878
name: Quickcheck ACVP (${{ matrix.target.name }}, ${{ matrix.acvp-version }})
@@ -89,9 +89,9 @@ jobs:
8989
external:
9090
- ${{ github.repository_owner != 'pq-code-package' }}
9191
target:
92-
- runner: pqcp-arm64
92+
- runner: ubuntu-24.04-arm
9393
name: 'aarch64'
94-
- runner: pqcp-arm64
94+
- runner: ubuntu-24.04-arm
9595
name: 'aarch64'
9696
- runner: ubuntu-latest
9797
name: 'x86_64'
@@ -102,7 +102,7 @@ jobs:
102102
exclude:
103103
- {external: true,
104104
target: {
105-
runner: pqcp-arm64,
105+
runner: ubuntu-24.04-arm,
106106
name: 'aarch64'
107107
}}
108108
name: Quickcheck bench (${{ matrix.target.name }})
@@ -138,14 +138,14 @@ jobs:
138138
external:
139139
- ${{ github.repository_owner != 'pq-code-package' }}
140140
target:
141-
- runner: pqcp-arm64
141+
- runner: ubuntu-24.04-arm
142142
name: 'aarch64'
143143
- runner: ubuntu-latest
144144
name: 'x86_64'
145145
exclude:
146146
- {external: true,
147147
target: {
148-
runner: pqcp-arm64,
148+
runner: ubuntu-24.04-arm,
149149
name: 'aarch64'
150150
}}
151151
name: Quickcheck C90 (${{ matrix.target.name }})
@@ -206,7 +206,7 @@ jobs:
206206
name: Quickcheck lib
207207
strategy:
208208
matrix:
209-
system: [macos-latest, macos-15-intel, ubuntu-latest, pqcp-arm64]
209+
system: [macos-latest, macos-15-intel, ubuntu-latest, ubuntu-24.04-arm]
210210
runs-on: ${{ matrix.system }}
211211
steps:
212212
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -217,7 +217,7 @@ jobs:
217217
name: Examples
218218
strategy:
219219
matrix:
220-
system: [macos-latest, macos-15-intel, ubuntu-latest, pqcp-arm64]
220+
system: [macos-latest, macos-15-intel, ubuntu-latest, ubuntu-24.04-arm]
221221
runs-on: ${{ matrix.system }}
222222
steps:
223223
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -268,7 +268,7 @@ jobs:
268268
name: Simplified
269269
- arg: '--no-simplify'
270270
name: Unmodified
271-
runs-on: pqcp-arm64
271+
runs-on: ubuntu-24.04-arm
272272
name: AArch64 dev backend (${{ matrix.backend.name }}, ${{ matrix.simplify.name }})
273273
steps:
274274
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -302,7 +302,7 @@ jobs:
302302
external:
303303
- ${{ github.repository_owner != 'pq-code-package' }}
304304
target:
305-
- runner: pqcp-arm64
305+
- runner: ubuntu-24.04-arm
306306
name: 'aarch64'
307307
- runner: ubuntu-latest
308308
name: 'x86_64'

‎.github/workflows/ci.yml‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -26,106 +26,106 @@ jobs:
2626
arch: mac
2727
mode: native
2828
nix_shell: ci
29-
- runner: pqcp-arm64
29+
- runner: ubuntu-24.04-arm
3030
name: 'ubuntu-latest (aarch64)'
3131
arch: aarch64
3232
mode: native
3333
nix_shell: ci
34-
- runner: pqcp-arm64
34+
- runner: ubuntu-24.04-arm
3535
name: 'ubuntu-latest (aarch64)'
3636
arch: x86_64
3737
mode: cross-x86_64
3838
nix_shell: ci-cross-x86_64
39-
- runner: pqcp-arm64
39+
- runner: ubuntu-24.04-arm
4040
name: 'ubuntu-latest (aarch64)'
4141
arch: riscv64
4242
mode: cross-riscv64
4343
nix_shell: ci-cross-riscv64
44-
- runner: pqcp-arm64
44+
- runner: ubuntu-24.04-arm
4545
name: 'ubuntu-latest (aarch64)'
4646
arch: riscv32
4747
mode: cross-riscv32
4848
nix_shell: ci-cross-riscv32
49-
- runner: pqcp-arm64
49+
- runner: ubuntu-24.04-arm
5050
name: 'ubuntu-latest (ppc64le)'
5151
arch: ppc64le
5252
mode: cross-ppc64le
5353
nix_shell: ci-cross-ppc64le
54-
- runner: pqcp-x64
54+
- runner: ubuntu-latest
5555
name: 'ubuntu-latest (x86_64)'
5656
arch: x86_64
5757
mode: native
5858
nix_shell: ci
59-
- runner: pqcp-x64
59+
- runner: ubuntu-latest
6060
name: 'ubuntu-latest (x86_64)'
6161
arch: aarch64
6262
mode: cross-aarch64
6363
nix_shell: ci-cross-aarch64
64-
- runner: pqcp-x64
64+
- runner: ubuntu-latest
6565
name: 'ubuntu-latest (x86_64)'
6666
arch: aarch64_be
6767
mode: cross-aarch64_be
6868
nix_shell: ci-cross-aarch64_be
6969
exclude:
7070
- {external: true,
7171
target: {
72-
runner: pqcp-arm64,
72+
runner: ubuntu-24.04-arm,
7373
name: 'ubuntu-latest (aarch64)',
7474
arch: aarch64,
7575
mode: native,
7676
nix_shell: ci
7777
}}
7878
- {external: true,
7979
target: {
80-
runner: pqcp-arm64,
80+
runner: ubuntu-24.04-arm,
8181
name: 'ubuntu-latest (aarch64)',
8282
arch: x86_64,
8383
mode: cross-x86_64,
8484
nix_shell: ci-cross-x86_64
8585
}}
8686
- {external: true,
8787
target: {
88-
runner: pqcp-arm64,
88+
runner: ubuntu-24.04-arm,
8989
name: 'ubuntu-latest (aarch64)',
9090
arch: riscv64,
9191
mode: cross-riscv64,
9292
nix_shell: ci-cross-riscv64
9393
}}
9494
- {external: true,
9595
target: {
96-
runner: pqcp-arm64,
96+
runner: ubuntu-24.04-arm,
9797
name: 'ubuntu-latest (aarch64)',
9898
arch: riscv32,
9999
mode: cross-riscv32,
100100
nix_shell: ci-cross-riscv32
101101
}}
102102
- {external: true,
103103
target: {
104-
runner: pqcp-arm64,
104+
runner: ubuntu-24.04-arm,
105105
name: 'ubuntu-latest (ppc64le)',
106106
arch: ppc64le,
107107
mode: cross-ppc64le,
108108
nix_shell: ci-cross-ppc64le
109109
}}
110110
- {external: true,
111111
target: {
112-
runner: pqcp-x64,
112+
runner: ubuntu-latest,
113113
name: 'ubuntu-latest (x86_64)',
114114
arch: x86_64,
115115
mode: native,
116116
nix_shell: ci
117117
}}
118118
- {external: true,
119119
target: {
120-
runner: pqcp-x64,
120+
runner: ubuntu-latest,
121121
name: 'ubuntu-latest (x86_64)',
122122
arch: aarch64,
123123
mode: cross-aarch64,
124124
nix_shell: ci-cross-aarch64
125125
}}
126126
- {external: true,
127127
target: {
128-
runner: pqcp-x64,
128+
runner: ubuntu-latest,
129129
name: 'ubuntu-latest (x86_64)',
130130
arch: aarch64_be,
131131
mode: cross-aarch64_be,
@@ -202,7 +202,7 @@ jobs:
202202
matrix:
203203
cflags: [ "-O0", "-Os", "-O3" ]
204204
target:
205-
- runner: pqcp-arm64
205+
- runner: ubuntu-24.04-arm
206206
name: 'aarch64'
207207
- runner: ubuntu-latest
208208
name: 'x86_64'
@@ -412,9 +412,9 @@ jobs:
412412
external:
413413
- ${{ github.repository_owner != 'pq-code-package' }}
414414
target:
415-
- runner: pqcp-x64
415+
- runner: ubuntu-latest
416416
name: x86_64
417-
- runner: pqcp-arm64
417+
- runner: ubuntu-24.04-arm
418418
name: aarch64
419419
cflags: ['-O3', '-Os']
420420
exclude:
@@ -445,19 +445,19 @@ jobs:
445445
external:
446446
- ${{ github.repository_owner != 'pq-code-package' }}
447447
target:
448-
- runner: pqcp-arm64
448+
- runner: ubuntu-24.04-arm
449449
name: 'ubuntu-latest (aarch64)'
450-
- runner: pqcp-x64
450+
- runner: ubuntu-latest
451451
name: 'ubuntu-latest (x86_64)'
452452
exclude:
453453
- {external: true,
454454
target: {
455-
runner: pqcp-arm64,
455+
runner: ubuntu-24.04-arm,
456456
name: 'ubuntu-latest (aarch64)',
457457
}}
458458
- {external: true,
459459
target: {
460-
runner: pqcp-x64,
460+
runner: ubuntu-latest,
461461
name: 'ubuntu-latest (x86_64)',
462462
}}
463463
runs-on: ${{ matrix.target.runner }}
@@ -501,14 +501,14 @@ jobs:
501501
external:
502502
- ${{ github.repository_owner != 'pq-code-package' }}
503503
target:
504-
- runner: pqcp-arm64
504+
- runner: ubuntu-24.04-arm
505505
name: 'aarch64'
506506
- runner: ubuntu-latest
507507
name: 'x86_64'
508508
exclude:
509509
- {external: true,
510510
target: {
511-
runner: pqcp-arm64,
511+
runner: ubuntu-24.04-arm,
512512
name: 'aarch64'
513513
}}
514514
name: Check API consistency
@@ -681,7 +681,7 @@ jobs:
681681
strategy:
682682
fail-fast: false
683683
matrix:
684-
system: [ubuntu-latest, pqcp-arm64]
684+
system: [ubuntu-latest, ubuntu-24.04-arm]
685685
runs-on: ${{ matrix.system }}
686686
name: Check autogenerated files
687687
steps:
@@ -695,7 +695,7 @@ jobs:
695695
python3 ./scripts/autogen --dry-run --force-cross
696696
- uses: ./.github/actions/setup-shell
697697
# Building the HOL-Light bytecode currently requires native compilation
698-
if: ${{ matrix.system == 'pqcp-arm64' }}
698+
if: ${{ matrix.system == 'ubuntu-24.04-arm' }}
699699
with:
700700
nix-shell: 'hol_light'
701701
gh_token: ${{ secrets.GITHUB_TOKEN }}

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

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
strategy:
2929
fail-fast: false
3030
matrix:
31-
system: [ubuntu-latest, pqcp-arm64]
31+
system: [ubuntu-latest, ubuntu-24.04-arm]
3232
fips: [0,1]
3333
name: AWS-LC FIPS test (${{ matrix.system }}, FIPS=${{ matrix.fips }})
3434
runs-on: ${{ matrix.system }}
@@ -73,7 +73,7 @@ jobs:
7373
max-parallel: 16
7474
fail-fast: false
7575
matrix:
76-
system: [ubuntu-latest, pqcp-arm64]
76+
system: [ubuntu-latest, ubuntu-24.04-arm]
7777
test:
7878
- name: Debug mode
7979
flags: -DENABLE_DILITHIUM=ON
@@ -127,7 +127,7 @@ jobs:
127127
max-parallel: 8
128128
fail-fast: false
129129
matrix:
130-
system: [ubuntu-latest, pqcp-arm64, macos-latest, macos-15-intel]
130+
system: [ubuntu-latest, ubuntu-24.04-arm, macos-latest, macos-15-intel]
131131
test:
132132
- name: Prefix+Debug
133133
flags:

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

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

0 commit comments

Comments
 (0)