Skip to content

Commit

Permalink
fix(bindings): Specify correct minimum versions
Browse files Browse the repository at this point in the history
  • Loading branch information
goatgoose committed Jan 13, 2025
1 parent a5d4e67 commit 9225d39
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 6 deletions.
35 changes: 35 additions & 0 deletions .github/workflows/ci_rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -366,3 +366,38 @@ jobs:
- name: Run tests
working-directory: ${{env.PCAP_TEST_PATH}}
run: cargo test --all-features

minimal-versions:
runs-on: ubuntu-24.04
strategy:
matrix:
workspace-path:
- bindings/rust/extended
- bindings/rust/standard
steps:
- uses: actions/checkout@v4

- name: Install Rust toolchain
id: toolchain
# minimal-versions is an unstable feature, and requires the nightly toolchain:
# https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#minimal-versions
run: |
rustup toolchain install ${{env.RUST_NIGHTLY_TOOLCHAIN}}
rustup override set ${{env.RUST_NIGHTLY_TOOLCHAIN}}
- uses: camshaft/rust-cache@v1

- name: Install cargo-minimal-versions
uses: baptiste0928/[email protected]
with:
crate: cargo-minimal-versions

- name: Generate
run: ./${{env.ROOT_PATH}}/generate.sh --skip-tests

- name: Test minimal versions
id: test-minimal-versions
working-directory: ${{matrix.workspace-path}}
run: |
cargo minimal-versions check --direct
cargo minimal-versions check --direct --all-features
4 changes: 2 additions & 2 deletions bindings/rust/extended/s2n-tls-sys/templates/Cargo.template
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ stacktrace = []
# unstable-foo = []

[dependencies]
aws-lc-rs = { version = "1" }
libc = "0.2"
aws-lc-rs = { version = "1.6.4" }
libc = "0.2.121"

[build-dependencies]
cc = { version = "1.0.100", features = ["parallel"] }
Expand Down
2 changes: 1 addition & 1 deletion bindings/rust/extended/s2n-tls-tokio/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ default = []

[dependencies]
errno = { version = "0.3" }
libc = { version = "0.2" }
libc = { version = "0.2.121" }
pin-project-lite = { version = "0.2" }
s2n-tls = { version = "=0.3.9", path = "../s2n-tls" }
tokio = { version = "1", features = ["net", "time"] }
Expand Down
2 changes: 1 addition & 1 deletion bindings/rust/extended/s2n-tls/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ unstable-testing = []

[dependencies]
errno = { version = "0.3" }
libc = "0.2"
libc = "0.2.121"
s2n-tls-sys = { version = "=0.3.9", path = "../s2n-tls-sys", features = ["internal"] }
pin-project-lite = "0.2"
hex = "0.4"
Expand Down
1 change: 1 addition & 0 deletions bindings/rust/standard/bench/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "bench"
version = "0.1.0"
edition = "2021"
publish = false

[dependencies]
s2n-tls = { path = "../../extended/s2n-tls" }
Expand Down
4 changes: 2 additions & 2 deletions bindings/rust/standard/s2n-tls-hyper/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ default = []
[dependencies]
s2n-tls = { version = "=0.3.9", path = "../../extended/s2n-tls" }
s2n-tls-tokio = { version = "=0.3.9", path = "../../extended/s2n-tls-tokio" }
hyper = { version = "1" }
hyper-util = { version = "0.1", features = ["client-legacy", "tokio", "http1", "http2"] }
hyper = { version = "1.4" }
hyper-util = { version = "0.1.7", features = ["client-legacy", "tokio", "http1", "http2"] }
tower-service = { version = "0.3" }
http = { version = "1" }

Expand Down

0 comments on commit 9225d39

Please sign in to comment.