Skip to content

Commit 7143e36

Browse files
tarcieritarcieri
committed
Merge branch 'master' into blake2_simd
2 parents 78292ec + a404714 commit 7143e36

411 files changed

Lines changed: 24403 additions & 8838 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/actions/cross-tests/action.yml‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎.github/workflows/ascon-hash.yml‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
name: ascon-hash
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- ".github/workflows/ascon-hash.yml"
7+
- "ascon-hash/**"
8+
- "Cargo.*"
9+
push:
10+
branches: master
11+
12+
defaults:
13+
run:
14+
working-directory: ascon-hash
15+
16+
env:
17+
RUSTFLAGS: "-Dwarnings"
18+
CARGO_INCREMENTAL: 0
19+
20+
# Cancels CI jobs when new commits are pushed to a PR branch
21+
concurrency:
22+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
23+
cancel-in-progress: true
24+
25+
jobs:
26+
set-msrv:
27+
uses: RustCrypto/actions/.github/workflows/set-msrv.yml@master
28+
with:
29+
msrv: 1.85.0
30+
31+
build:
32+
needs: set-msrv
33+
runs-on: ubuntu-latest
34+
strategy:
35+
matrix:
36+
rust:
37+
- ${{needs.set-msrv.outputs.msrv}}
38+
- stable
39+
target:
40+
- thumbv7em-none-eabi
41+
- wasm32-unknown-unknown
42+
steps:
43+
- uses: actions/checkout@v5
44+
- uses: RustCrypto/actions/cargo-cache@master
45+
- uses: dtolnay/rust-toolchain@master
46+
with:
47+
toolchain: ${{ matrix.rust }}
48+
targets: ${{ matrix.target }}
49+
- uses: RustCrypto/actions/cargo-hack-install@master
50+
- run: cargo hack build --target ${{ matrix.target }} --each-feature --exclude-features default,std
51+
52+
minimal-versions:
53+
uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
54+
with:
55+
working-directory: ${{ github.workflow }}
56+
57+
test:
58+
needs: set-msrv
59+
runs-on: ubuntu-latest
60+
strategy:
61+
matrix:
62+
rust:
63+
- ${{needs.set-msrv.outputs.msrv}}
64+
- stable
65+
steps:
66+
- uses: actions/checkout@v5
67+
- uses: RustCrypto/actions/cargo-cache@master
68+
- uses: dtolnay/rust-toolchain@master
69+
with:
70+
toolchain: ${{ matrix.rust }}
71+
- uses: RustCrypto/actions/cargo-hack-install@master
72+
- run: cargo hack test --feature-powerset

‎.github/workflows/belt-hash.yml‎

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,49 +17,56 @@ env:
1717
CARGO_INCREMENTAL: 0
1818
RUSTFLAGS: "-Dwarnings"
1919

20+
# Cancels CI jobs when new commits are pushed to a PR branch
21+
concurrency:
22+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
23+
cancel-in-progress: true
24+
2025
jobs:
26+
set-msrv:
27+
uses: RustCrypto/actions/.github/workflows/set-msrv.yml@master
28+
with:
29+
msrv: 1.85.0
30+
2131
build:
32+
needs: set-msrv
2233
runs-on: ubuntu-latest
2334
strategy:
2435
matrix:
2536
rust:
26-
- 1.57.0 # MSRV
37+
- ${{needs.set-msrv.outputs.msrv}}
2738
- stable
2839
target:
2940
- thumbv7em-none-eabi
3041
- wasm32-unknown-unknown
3142
steps:
32-
- uses: actions/checkout@v3
43+
- uses: actions/checkout@v5
3344
- uses: RustCrypto/actions/cargo-cache@master
34-
- uses: actions-rs/toolchain@v1
45+
- uses: dtolnay/rust-toolchain@master
3546
with:
36-
profile: minimal
3747
toolchain: ${{ matrix.rust }}
38-
target: ${{ matrix.target }}
39-
override: true
40-
- run: cargo build --no-default-features --target ${{ matrix.target }}
41-
42-
minimal-versions:
43-
uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
44-
with:
45-
working-directory: ${{ github.workflow }}
48+
targets: ${{ matrix.target }}
49+
- uses: RustCrypto/actions/cargo-hack-install@master
50+
- run: cargo hack build --target ${{ matrix.target }} --each-feature --exclude-features default,std
4651

4752
test:
53+
needs: set-msrv
4854
runs-on: ubuntu-latest
4955
strategy:
5056
matrix:
5157
rust:
52-
- 1.57.0 # MSRV
58+
- ${{needs.set-msrv.outputs.msrv}}
5359
- stable
5460
steps:
55-
- uses: actions/checkout@v3
61+
- uses: actions/checkout@v5
5662
- uses: RustCrypto/actions/cargo-cache@master
57-
- uses: actions-rs/toolchain@v1
63+
- uses: dtolnay/rust-toolchain@master
5864
with:
59-
profile: minimal
6065
toolchain: ${{ matrix.rust }}
61-
override: true
62-
- run: cargo check --all-features
63-
- run: cargo test --no-default-features
64-
- run: cargo test
65-
- run: cargo test --all-features
66+
- uses: RustCrypto/actions/cargo-hack-install@master
67+
- run: cargo hack test --feature-powerset
68+
69+
minimal-versions:
70+
uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
71+
with:
72+
working-directory: ${{ github.workflow }}

‎.github/workflows/blake2.yml‎

Lines changed: 75 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: blake2
33
on:
44
pull_request:
55
paths:
6+
- ".github/workflows/blake2.yml"
67
- "blake2/**"
78
- "Cargo.*"
89
push:
@@ -16,42 +17,98 @@ env:
1617
CARGO_INCREMENTAL: 0
1718
RUSTFLAGS: "-Dwarnings"
1819

20+
# Cancels CI jobs when new commits are pushed to a PR branch
21+
concurrency:
22+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
23+
cancel-in-progress: true
24+
1925
jobs:
26+
set-msrv:
27+
uses: RustCrypto/actions/.github/workflows/set-msrv.yml@master
28+
with:
29+
msrv: 1.85.0
30+
2031
build:
32+
needs: set-msrv
2133
runs-on: ubuntu-latest
2234
strategy:
2335
matrix:
2436
rust:
25-
- 1.41.0 # MSRV
37+
- ${{needs.set-msrv.outputs.msrv}}
2638
- stable
2739
target:
2840
- thumbv7em-none-eabi
2941
- wasm32-unknown-unknown
3042
steps:
31-
- uses: actions/checkout@v1
32-
- uses: actions-rs/toolchain@v1
43+
- uses: actions/checkout@v5
44+
- uses: RustCrypto/actions/cargo-cache@master
45+
- uses: dtolnay/rust-toolchain@master
3346
with:
34-
profile: minimal
3547
toolchain: ${{ matrix.rust }}
36-
target: ${{ matrix.target }}
37-
override: true
38-
- run: cargo build --target ${{ matrix.target }} --release --no-default-features
39-
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features blake2b
40-
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features blake2s
41-
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features blake2b,blake2s
48+
targets: ${{ matrix.target }}
49+
- uses: RustCrypto/actions/cargo-hack-install@master
50+
- run: cargo hack build --target ${{ matrix.target }} --each-feature --exclude-features default,std,simd,simd_asm,simd_opt
4251

4352
test:
53+
needs: set-msrv
4454
runs-on: ubuntu-latest
4555
strategy:
4656
matrix:
4757
rust:
48-
- 1.41.0 # MSRV
58+
- ${{needs.set-msrv.outputs.msrv}}
4959
- stable
5060
steps:
51-
- uses: actions/checkout@v1
52-
- uses: actions-rs/toolchain@v1
53-
with:
54-
profile: minimal
55-
toolchain: ${{ matrix.rust }}
56-
override: true
57-
- run: cargo test --release
61+
- uses: actions/checkout@v5
62+
- uses: RustCrypto/actions/cargo-cache@master
63+
- uses: dtolnay/rust-toolchain@master
64+
with:
65+
toolchain: ${{ matrix.rust }}
66+
- uses: RustCrypto/actions/cargo-hack-install@master
67+
- run: cargo hack test --feature-powerset --exclude-features simd,simd_asm,simd_opt
68+
69+
70+
minimal-versions:
71+
uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
72+
with:
73+
working-directory: ${{ github.workflow }}
74+
stable-cmd: cargo hack test --release --feature-powerset --exclude-features simd,simd_opt,simd_asm
75+
76+
# No longer builds on recent nightlies
77+
# simd:
78+
# runs-on: ubuntu-latest
79+
# steps:
80+
# - uses: actions/checkout@v5
81+
# - uses: RustCrypto/actions/cargo-cache@master
82+
# - uses: dtolnay/rust-toolchain@master
83+
# with:
84+
# toolchain: nightly-2021-05-01
85+
# - run: cargo test --features simd
86+
# - run: cargo test --features simd_opt
87+
# - run: cargo test --features simd_asm
88+
89+
# Cross-compiled tests
90+
cross:
91+
needs: set-msrv
92+
strategy:
93+
matrix:
94+
rust:
95+
- ${{needs.set-msrv.outputs.msrv}}
96+
- stable
97+
target:
98+
- aarch64-unknown-linux-gnu
99+
- powerpc-unknown-linux-gnu
100+
features:
101+
- default
102+
103+
runs-on: ubuntu-latest
104+
defaults:
105+
run:
106+
# Cross mounts only current package, i.e. by default it ignores workspace's Cargo.toml
107+
working-directory: .
108+
steps:
109+
- uses: RustCrypto/actions/cross-tests@master
110+
with:
111+
rust: ${{ matrix.rust }}
112+
package: ${{ github.workflow }}
113+
target: ${{ matrix.target }}
114+
features: ${{ matrix.features }}

‎.github/workflows/fsb.yml‎

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,49 +17,57 @@ env:
1717
CARGO_INCREMENTAL: 0
1818
RUSTFLAGS: "-Dwarnings"
1919

20+
# Cancels CI jobs when new commits are pushed to a PR branch
21+
concurrency:
22+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
23+
cancel-in-progress: true
24+
2025
jobs:
26+
set-msrv:
27+
uses: RustCrypto/actions/.github/workflows/set-msrv.yml@master
28+
with:
29+
msrv: 1.85.0
30+
2131
build:
32+
needs: set-msrv
2233
runs-on: ubuntu-latest
2334
strategy:
2435
matrix:
2536
rust:
26-
- 1.41.0 # MSRV
37+
- ${{needs.set-msrv.outputs.msrv}}
2738
- stable
2839
target:
2940
- thumbv7em-none-eabi
3041
- wasm32-unknown-unknown
3142
steps:
32-
- uses: actions/checkout@v3
43+
- uses: actions/checkout@v5
3344
- uses: RustCrypto/actions/cargo-cache@master
34-
- uses: actions-rs/toolchain@v1
45+
- uses: dtolnay/rust-toolchain@master
3546
with:
36-
profile: minimal
3747
toolchain: ${{ matrix.rust }}
38-
target: ${{ matrix.target }}
39-
override: true
40-
- run: cargo build --no-default-features --target ${{ matrix.target }}
41-
42-
minimal-versions:
43-
uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
44-
with:
45-
working-directory: ${{ github.workflow }}
48+
targets: ${{ matrix.target }}
49+
- uses: RustCrypto/actions/cargo-hack-install@master
50+
- run: cargo hack build --target ${{ matrix.target }} --each-feature --exclude-features default,std
4651

4752
test:
53+
needs: set-msrv
4854
runs-on: ubuntu-latest
4955
strategy:
5056
matrix:
5157
rust:
52-
- 1.41.0 # MSRV
58+
- ${{needs.set-msrv.outputs.msrv}}
5359
- stable
5460
steps:
55-
- uses: actions/checkout@v3
61+
- uses: actions/checkout@v5
5662
- uses: RustCrypto/actions/cargo-cache@master
57-
- uses: actions-rs/toolchain@v1
63+
- uses: dtolnay/rust-toolchain@master
5864
with:
59-
profile: minimal
6065
toolchain: ${{ matrix.rust }}
61-
override: true
62-
- run: cargo check --all-features
63-
- run: cargo test --no-default-features
64-
- run: cargo test
65-
- run: cargo test --all-features
66+
- uses: RustCrypto/actions/cargo-hack-install@master
67+
- run: cargo hack test --feature-powerset
68+
69+
# Disabled until new `whirlpool` prerelease is cut (@tarcieri)
70+
# minimal-versions:
71+
# uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
72+
# with:
73+
# working-directory: ${{ github.workflow }}

0 commit comments

Comments
 (0)