diff --git a/.github/workflows/cross.yml b/.github/workflows/cross.yml index fed5655fa1b61..a4a6846d8314c 100644 --- a/.github/workflows/cross.yml +++ b/.github/workflows/cross.yml @@ -58,6 +58,7 @@ jobs: - run: echo "::add-matcher::.github/matchers/rust.json" - run: | + rustup show active-toolchain || rustup toolchain install rustup target add x86_64-unknown-linux-gnu cargo install cross --version 0.2.4 --force --locked # Why is this build, not check? Because we need to make sure the linking phase works. diff --git a/Cargo.lock b/Cargo.lock index 41e18200dc030..dbc24c00517d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8351,9 +8351,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.11" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da5349ae27d3887ca812fb375b45a4fbb36d8d12d2df394968cd86e35683fe73" +checksum = "70ac5d832aa16abd7d1def883a8545280c20a60f523a370aa3a9617c2b8550ee" dependencies = [ "cc", "cfg-if", diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index dcc150753ab9f..210cd5a052e7a 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -517,7 +517,7 @@ rend,https://github.com/djkoloski/rend,MIT,David Koloski reqwest,https://github.com/seanmonstar/reqwest,MIT OR Apache-2.0,Sean McArthur resolv-conf,http://github.com/tailhook/resolv-conf,MIT OR Apache-2.0,paul@colomiets.name rfc6979,https://github.com/RustCrypto/signatures/tree/master/rfc6979,Apache-2.0 OR MIT,RustCrypto Developers -ring,https://github.com/ctz/ring,Apache-2.0 AND ISC,The ring Authors +ring,https://github.com/briansmith/ring,Apache-2.0 AND ISC,The ring Authors rkyv,https://github.com/rkyv/rkyv,MIT,David Koloski rle-decode-fast,https://github.com/WanzenBug/rle-decode-helper,MIT OR Apache-2.0,Moritz Wanzenböck rmp,https://github.com/3Hren/msgpack-rust,MIT,Evgeny Safronov