Skip to content

Commit a09b66e

Browse files
authored
Update to 8.10.1 (alexcrichton#573)
* Update to 8.10.1 * Disable rustls windows cross-compile test Rustls no longer works for cross-compiling due to switching to aws-lc (from ring). It seems to want to run `.bat` files for some NASM-related stuff. We could, in the future, expose `ring` as a rustls backend as a feature if someone wants to continue using that. * Don't try rustls on i686-pc-windows-msvc It requires nasm to be installed, and I don't want to hassle with that right now.
1 parent 6fa1bf0 commit a09b66e

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

ci/run.sh

+12-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,18 @@ cargo test --target $TARGET --no-run
66
# First test with no extra protocols enabled.
77
cargo test --target $TARGET --no-run --features static-curl
88
# Then with rustls TLS backend.
9-
cargo test --target $TARGET --no-run --features rustls,static-curl
9+
#
10+
# Note: Cross-compiling rustls on windows doesn't work due to requiring some
11+
# NASM build stuff in aws_lc_rs, which may soon be fixed by
12+
# https://github.com/aws/aws-lc-rs/pull/528.
13+
#
14+
# Compiling on i686-windows requires nasm to be installed (other platforms
15+
# have pre-compiled object files), which is just slightly too much
16+
# inconvenience for me.
17+
if [ "$TARGET" != "x86_64-pc-windows-gnu" ] && [ "$TARGET" != "i686-pc-windows-msvc" ]
18+
then
19+
cargo test --target $TARGET --no-run --features rustls,static-curl
20+
fi
1021
# Then with all extra protocols enabled.
1122
cargo test --target $TARGET --no-run --features static-curl,protocol-ftp,ntlm
1223
if [ -z "$NO_RUN" ]; then

curl-sys/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "curl-sys"
3-
version = "0.4.75+curl-8.10.0"
3+
version = "0.4.76+curl-8.10.1"
44
authors = ["Alex Crichton <[email protected]>"]
55
links = "curl"
66
build = "build.rs"
@@ -22,7 +22,7 @@ libc = "0.2.2"
2222
libnghttp2-sys = { optional = true, version = "0.1.3" }
2323

2424
[dependencies.rustls-ffi]
25-
version = "0.13"
25+
version = "0.14"
2626
optional = true
2727
features = ["no_log_capture"]
2828

curl-sys/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ fn main() {
108108
.replace("@LIBCURL_LIBS@", "")
109109
.replace("@SUPPORT_FEATURES@", "")
110110
.replace("@SUPPORT_PROTOCOLS@", "")
111-
.replace("@CURLVERSION@", "8.10.0"),
111+
.replace("@CURLVERSION@", "8.10.1"),
112112
)
113113
.unwrap();
114114

curl-sys/curl

Submodule curl updated 92 files

0 commit comments

Comments
 (0)