Skip to content

Commit 3aac1a7

Browse files
Merge branch 'master' of https://github.com/RustCrypto/rustls-rustcrypto into patch-refactor-code-part
2 parents ec28ed4 + 2e1e604 commit 3aac1a7

23 files changed

Lines changed: 1228 additions & 2309 deletions

File tree

.github/dependabot.yml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,30 @@
11
version: 2
22
updates:
33
- package-ecosystem: cargo
4+
versioning-strategy: lockfile-only
45
directory: "/"
6+
allow:
7+
- dependency-type: "all"
8+
groups:
9+
root-deps:
10+
patterns:
11+
- "*"
512
schedule:
613
interval: daily
7-
open-pull-requests-limit: 10
14+
15+
- package-ecosystem: cargo
16+
versioning-strategy: lockfile-only
17+
directory: "validation/local_ping_pong_openssl"
18+
allow:
19+
- dependency-type: "all"
20+
groups:
21+
validation-deps:
22+
patterns:
23+
- "*"
24+
schedule:
25+
interval: daily
26+
827
- package-ecosystem: github-actions
928
directory: "/"
1029
schedule:
1130
interval: weekly
12-
open-pull-requests-limit: 10

.github/workflows/local_openssl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- stable
2929
runs-on: ubuntu-latest
3030
steps:
31-
- uses: actions/checkout@v4
31+
- uses: actions/checkout@v6
3232
- uses: RustCrypto/actions/cargo-cache@master
3333
- uses: dtolnay/rust-toolchain@master
3434
with:

.github/workflows/rustls-rustcrypto.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ jobs:
2020
clippy:
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v6
2424
- uses: dtolnay/rust-toolchain@master
2525
with:
26-
toolchain: 1.75.0
26+
toolchain: 1.85.0
2727
components: clippy
2828
- run: cargo clippy --all --all-features -- -D warnings
2929

3030
doc:
3131
runs-on: ubuntu-latest
3232
steps:
33-
- uses: actions/checkout@v4
33+
- uses: actions/checkout@v6
3434
- uses: dtolnay/rust-toolchain@master
3535
with:
3636
toolchain: stable
@@ -39,7 +39,7 @@ jobs:
3939
rustfmt:
4040
runs-on: ubuntu-latest
4141
steps:
42-
- uses: actions/checkout@v4
42+
- uses: actions/checkout@v6
4343
- uses: dtolnay/rust-toolchain@master
4444
with:
4545
toolchain: stable
@@ -51,29 +51,31 @@ jobs:
5151
strategy:
5252
matrix:
5353
rust:
54-
- 1.75.0 # MSRV
54+
- 1.85.0 # MSRV
5555
- stable
5656
target:
5757
- armv7a-none-eabi
5858
- thumbv7em-none-eabi
5959
- wasm32-unknown-unknown
6060
steps:
61-
- uses: actions/checkout@v4
61+
- uses: actions/checkout@v6
6262
- uses: dtolnay/rust-toolchain@master
6363
with:
6464
toolchain: ${{ matrix.rust }}
6565
targets: ${{ matrix.target }}
66-
- run: cargo build --no-default-features --features tls12,alloc --release --target ${{ matrix.target }}
66+
- env:
67+
RUSTFLAGS: --cfg getrandom_backend="unsupported"
68+
run: cargo build --no-default-features --features tls12,alloc --release --target ${{ matrix.target }}
6769

6870
test:
6971
strategy:
7072
matrix:
7173
toolchain:
72-
- 1.75.0 # MSRV
74+
- 1.85.0 # MSRV
7375
- stable
7476
runs-on: ubuntu-latest
7577
steps:
76-
- uses: actions/checkout@v4
78+
- uses: actions/checkout@v6
7779
- uses: RustCrypto/actions/cargo-cache@master
7880
- uses: dtolnay/rust-toolchain@master
7981
with:
@@ -87,12 +89,12 @@ jobs:
8789
matrix:
8890
include:
8991
- target: powerpc-unknown-linux-gnu
90-
rust: 1.75.0 # MSRV
92+
rust: 1.85.0 # MSRV
9193
- target: powerpc-unknown-linux-gnu
9294
rust: stable
9395
runs-on: ubuntu-latest
9496
steps:
95-
- uses: actions/checkout@v4
97+
- uses: actions/checkout@v6
9698
- run: ${{ matrix.deps }}
9799
- uses: dtolnay/rust-toolchain@master
98100
with:

0 commit comments

Comments
 (0)