Update to sequoia-net 0.27
- Change the Windows CI job from `windows-msvc` to `windows-gnu` as `sq` now depends on OpenSSL, which is easier to install under `windows-gnu`.
This commit is contained in:
parent
1492c0a6fe
commit
e01ec617eb
@ -160,13 +160,13 @@ clippy:
|
||||
CARGO_TARGET_DIR: /target
|
||||
CARGO_HOME: /cargo
|
||||
|
||||
windows-msvc-cng:
|
||||
windows-gnu-cng:
|
||||
tags:
|
||||
- win
|
||||
- win2019
|
||||
stage: build
|
||||
interruptible: true
|
||||
image: 192.168.122.1:5000/sequoia-pgp/build-docker-image/windows-msvc
|
||||
image: 192.168.122.1:5000/sequoia-pgp/build-docker-image/windows-gnu
|
||||
only:
|
||||
variables:
|
||||
# Forks of this project most likely use gitlab's shared windows runners, which
|
||||
@ -179,11 +179,12 @@ windows-msvc-cng:
|
||||
- rustc --version --verbose
|
||||
- cargo --version
|
||||
script:
|
||||
- Remove-Item tests\sq-subplot.rs # until https://gitlab.com/subplot/subplot/-/issues/232 is fixed
|
||||
- cargo test --no-default-features --features crypto-cng,compression-bzip2
|
||||
# https://github.com/rust-lang/cargo/issues/5015
|
||||
- pacman --noconfirm --needed -S mingw-w64-x86_64-openssl
|
||||
- cargo test --tests --no-default-features --features crypto-cng,compression-bzip2
|
||||
after_script: [] # scriptlet doesn't work on Powershell
|
||||
variables:
|
||||
CFLAGS: "" # Silence some C warnings when compiling with MSVC
|
||||
CFLAGS: "" # Silence some C warnings when compiling under Windows
|
||||
|
||||
docker-build-push:
|
||||
# Official docker image.
|
||||
|
30
Cargo.lock
generated
30
Cargo.lock
generated
@ -2750,7 +2750,7 @@ dependencies = [
|
||||
"once_cell",
|
||||
"openpgp-cert-d",
|
||||
"rayon",
|
||||
"sequoia-net",
|
||||
"sequoia-net 0.26.0",
|
||||
"sequoia-openpgp",
|
||||
"thiserror",
|
||||
"tokio",
|
||||
@ -2781,6 +2781,31 @@ dependencies = [
|
||||
"zbase32",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sequoia-net"
|
||||
version = "0.27.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "960f1ea77bf8b6f455285424257574d66fa29223e4286268017a4458cc29d33f"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"base64",
|
||||
"futures-util",
|
||||
"http",
|
||||
"hyper",
|
||||
"hyper-tls",
|
||||
"libc",
|
||||
"native-tls",
|
||||
"percent-encoding",
|
||||
"sequoia-openpgp",
|
||||
"tempfile",
|
||||
"thiserror",
|
||||
"tokio",
|
||||
"trust-dns-client",
|
||||
"trust-dns-resolver",
|
||||
"url",
|
||||
"zbase32",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sequoia-openpgp"
|
||||
version = "1.14.0"
|
||||
@ -2877,7 +2902,7 @@ dependencies = [
|
||||
"rpassword",
|
||||
"sequoia-autocrypt",
|
||||
"sequoia-cert-store",
|
||||
"sequoia-net",
|
||||
"sequoia-net 0.27.0",
|
||||
"sequoia-openpgp",
|
||||
"sequoia-wot",
|
||||
"serde",
|
||||
@ -3620,6 +3645,7 @@ dependencies = [
|
||||
"idna 0.2.3",
|
||||
"ipnet",
|
||||
"lazy_static",
|
||||
"openssl",
|
||||
"rand 0.8.5",
|
||||
"ring",
|
||||
"smallvec",
|
||||
|
@ -34,7 +34,7 @@ dirs = "4"
|
||||
dot-writer = "0.1.3"
|
||||
sequoia-openpgp = { version = "1.13", default-features = false, features = ["compression-deflate"] }
|
||||
sequoia-autocrypt = { version = "0.25", default-features = false, optional = true }
|
||||
sequoia-net = { version = "0.26", default-features = false }
|
||||
sequoia-net = { version = "0.27", default-features = false }
|
||||
anyhow = "1.0.18"
|
||||
chrono = "0.4.10"
|
||||
# For an MSVR of 1.63: 4.0.32.
|
||||
@ -60,7 +60,7 @@ clap_complete = "4"
|
||||
clap_mangen = "0.2"
|
||||
chrono = "0.4.10"
|
||||
sequoia-openpgp = { version = "1.13", default-features = false }
|
||||
sequoia-net = { version = "0.26", default-features = false }
|
||||
sequoia-net = { version = "0.27", default-features = false }
|
||||
subplot-build = "0.6.0"
|
||||
cfg-if = "1"
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user