Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use rustls 0.21.9, revert nightly pin, update version to 0.11.1 #362

Merged
merged 8 commits into from
Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 1 addition & 17 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
# Note: This test file temporarily pins nightly-2023-11-01 instead of the latest nightly,
# because the requirements for an unstable feature changed recently, which causes this
# error on latest nightly:
#
# error[E0658]: use of unstable library feature 'core_io_borrowed_buf'
#
name: rustls-ffi

permissions:
Expand Down Expand Up @@ -84,8 +78,6 @@ jobs:
persist-credentials: false
- name: Install nightly rust toolchain
uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2023-11-01
- name: Configure CMake
run: cmake -S . -B build
- name: Build, debug configuration
Expand All @@ -103,8 +95,6 @@ jobs:
persist-credentials: false
- name: Install nightly rust toolchain
uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2023-11-01
- name: Configure CMake
run: cmake -S . -B build
- name: Build, release configuration
Expand All @@ -119,10 +109,8 @@ jobs:
- uses: actions/checkout@v4
with:
persist-credentials: false
- name: Install stable rust toolchain
- name: Install nightly rust toolchain
uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2023-11-01
- name: Install cbindgen
# Pin the installed version of cbindgen so that local usage can be
# reliably matched to CI. There can be non-semantic differences in
Expand All @@ -145,8 +133,6 @@ jobs:

- name: Install rust toolchain
uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2023-11-01

- name: cargo doc (all features)
run: cargo doc --all-features --no-deps --workspace
Expand All @@ -164,8 +150,6 @@ jobs:

- name: Install rust toolchain
uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2023-11-01

- name: Build client/server binaries
run: make target/client target/server
Expand Down
192 changes: 66 additions & 126 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rustls-ffi"
version = "0.11.0"
version = "0.11.1"
authors = ["Jacob Hoffman-Andrews <[email protected]>"]
license = "Apache-2.0/ISC/MIT"
readme = "README-crates.io.md"
Expand All @@ -23,7 +23,7 @@ read_buf = ["rustls/read_buf"]

[dependencies]
# Keep in sync with RUSTLS_CRATE_VERSION in build.rs
rustls = { version = "=0.21.5", features = [ "dangerous_configuration" ] }
rustls = { version = "=0.21.9", features = [ "dangerous_configuration" ] }
rustls-webpki = "0.101.0"
libc = "0.2"
sct = "0.7"
Expand Down
Loading