Skip to content

Commit b8a3705

Browse files
eternal-flame-ADeternal-flame-AD
committed
Merge branch 'master' into scrypt-sse2
2 parents aea4297 + 63bced6 commit b8a3705

36 files changed

+1967
-2050
lines changed

‎.github/workflows/argon2.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- thumbv7em-none-eabi
3030
- wasm32-unknown-unknown
3131
steps:
32-
- uses: actions/checkout@v4
32+
- uses: actions/checkout@v5
3333
- uses: RustCrypto/actions/cargo-cache@master
3434
- uses: dtolnay/rust-toolchain@master
3535
with:
@@ -65,7 +65,7 @@ jobs:
6565
- target: x86_64-unknown-linux-gnu
6666
rust: stable
6767
steps:
68-
- uses: actions/checkout@v4
68+
- uses: actions/checkout@v5
6969
- uses: RustCrypto/actions/cargo-cache@master
7070
- uses: dtolnay/rust-toolchain@master
7171
with:
@@ -80,12 +80,15 @@ jobs:
8080
careful:
8181
runs-on: ubuntu-latest
8282
steps:
83-
- uses: actions/checkout@v4
83+
- uses: actions/checkout@v5
8484
- uses: dtolnay/rust-toolchain@nightly
8585
- run: cargo install cargo-careful
8686
- run: cargo careful test --all-features
8787

8888
cross:
89+
# Temporarily disabled because of the compiler bug:
90+
# https://github.com/rust-lang/rust/issues/145693
91+
if: false
8992
strategy:
9093
matrix:
9194
include:
@@ -95,7 +98,7 @@ jobs:
9598
rust: stable
9699
runs-on: ubuntu-latest
97100
steps:
98-
- uses: actions/checkout@v4
101+
- uses: actions/checkout@v5
99102
- run: ${{ matrix.deps }}
100103
- uses: dtolnay/rust-toolchain@master
101104
with:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- thumbv7em-none-eabi
2929
- wasm32-unknown-unknown
3030
steps:
31-
- uses: actions/checkout@v4
31+
- uses: actions/checkout@v5
3232
- uses: RustCrypto/actions/cargo-cache@master
3333
- uses: dtolnay/rust-toolchain@master
3434
with:
@@ -52,7 +52,7 @@ jobs:
5252
- 1.85.0 # MSRV
5353
- stable
5454
steps:
55-
- uses: actions/checkout@v4
55+
- uses: actions/checkout@v5
5656
- uses: RustCrypto/actions/cargo-cache@master
5757
- uses: dtolnay/rust-toolchain@master
5858
with:

‎.github/workflows/bcrypt-pbkdf.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- thumbv7em-none-eabi
2929
- wasm32-unknown-unknown
3030
steps:
31-
- uses: actions/checkout@v4
31+
- uses: actions/checkout@v5
3232
- uses: RustCrypto/actions/cargo-cache@master
3333
- uses: dtolnay/rust-toolchain@master
3434
with:
@@ -51,7 +51,7 @@ jobs:
5151
- 1.85.0 # MSRV
5252
- stable
5353
steps:
54-
- uses: actions/checkout@v4
54+
- uses: actions/checkout@v5
5555
- uses: RustCrypto/actions/cargo-cache@master
5656
- uses: dtolnay/rust-toolchain@master
5757
with:

‎.github/workflows/fuzz_build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-latest
2424
if: false # disabled while using pre-releases
2525
steps:
26-
- uses: actions/checkout@v4
26+
- uses: actions/checkout@v5
2727
- uses: RustCrypto/actions/cargo-cache@master
2828
- uses: dtolnay/rust-toolchain@master
2929
with:

‎.github/workflows/password-auth.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- 1.85.0 # MSRV
3030
- stable
3131
steps:
32-
- uses: actions/checkout@v4
32+
- uses: actions/checkout@v5
3333
- uses: RustCrypto/actions/cargo-cache@master
3434
- uses: dtolnay/rust-toolchain@master
3535
with:
@@ -50,7 +50,7 @@ jobs:
5050
- 1.85.0 # MSRV
5151
- stable
5252
steps:
53-
- uses: actions/checkout@v4
53+
- uses: actions/checkout@v5
5454
- uses: RustCrypto/actions/cargo-cache@master
5555
- uses: dtolnay/rust-toolchain@master
5656
with:

‎.github/workflows/pbkdf2.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- thumbv7em-none-eabi
2929
- wasm32-unknown-unknown
3030
steps:
31-
- uses: actions/checkout@v4
31+
- uses: actions/checkout@v5
3232
- uses: RustCrypto/actions/cargo-cache@master
3333
- uses: dtolnay/rust-toolchain@master
3434
with:
@@ -51,7 +51,7 @@ jobs:
5151
- 1.85.0 # MSRV
5252
- stable
5353
steps:
54-
- uses: actions/checkout@v4
54+
- uses: actions/checkout@v5
5555
- uses: RustCrypto/actions/cargo-cache@master
5656
- uses: dtolnay/rust-toolchain@master
5757
with:

‎.github/workflows/readme.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
test:
2323
runs-on: ubuntu-latest
2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2626
- uses: RustCrypto/actions/cargo-cache@master
2727
- uses: dtolnay/rust-toolchain@master
2828
with:

‎.github/workflows/scrypt.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- thumbv7em-none-eabi
2929
- wasm32-unknown-unknown
3030
steps:
31-
- uses: actions/checkout@v4
31+
- uses: actions/checkout@v5
3232
- uses: RustCrypto/actions/cargo-cache@master
3333
- uses: dtolnay/rust-toolchain@master
3434
with:
@@ -52,7 +52,7 @@ jobs:
5252
- 1.85.0 # MSRV
5353
- stable
5454
steps:
55-
- uses: actions/checkout@v4
55+
- uses: actions/checkout@v5
5656
- uses: RustCrypto/actions/cargo-cache@master
5757
- uses: dtolnay/rust-toolchain@master
5858
with:

‎.github/workflows/security-audit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
name: Security Audit
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v4
20+
- uses: actions/checkout@v5
2121
- uses: RustCrypto/actions/cargo-cache@master
2222
- uses: dtolnay/rust-toolchain@master
2323
with:

‎.github/workflows/sha-crypt.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- thumbv7em-none-eabi
2929
- wasm32-unknown-unknown
3030
steps:
31-
- uses: actions/checkout@v4
31+
- uses: actions/checkout@v5
3232
- uses: RustCrypto/actions/cargo-cache@master
3333
- uses: dtolnay/rust-toolchain@master
3434
with:
@@ -50,7 +50,7 @@ jobs:
5050
- 1.85.0 # MSRV
5151
- stable
5252
steps:
53-
- uses: actions/checkout@v4
53+
- uses: actions/checkout@v5
5454
- uses: RustCrypto/actions/cargo-cache@master
5555
- uses: dtolnay/rust-toolchain@master
5656
with:

0 commit comments

Comments
 (0)