From 635dacb653fe6fa62f7076da61af0c1d920cfb95 Mon Sep 17 00:00:00 2001 From: Googlefan Date: Sat, 22 Feb 2025 09:08:49 +0000 Subject: [PATCH] fix --- .github/workflows/CI.yml | 20 ++++----- Cargo.lock | 83 +++++++++++++++++++++++++++++++++++++ crates/sbv2_core/Cargo.toml | 2 +- 3 files changed, 94 insertions(+), 11 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ecb7b85..3fb6eba 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -50,7 +50,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: wheels-linux-${{ matrix.platform.target }} - path: sbv2_bindings/dist + path: ./crates/sbv2_bindings/dist windows: runs-on: ${{ matrix.platform.runner }} @@ -71,12 +71,12 @@ jobs: target: ${{ matrix.platform.target }} args: --release --out dist --find-interpreter sccache: 'true' - working-directory: sbv2_bindings + working-directory: ./crates/sbv2_bindings - name: Upload wheels uses: actions/upload-artifact@v4 with: name: wheels-windows-${{ matrix.platform.target }} - path: sbv2_bindings/dist + path: ./crates/sbv2_bindings/dist macos: runs-on: ${{ matrix.platform.runner }} @@ -96,12 +96,12 @@ jobs: target: ${{ matrix.platform.target }} args: --release --out dist --find-interpreter sccache: 'true' - working-directory: sbv2_bindings + working-directory: ./crates/sbv2_bindings - name: Upload wheels uses: actions/upload-artifact@v4 with: name: wheels-macos-${{ matrix.platform.target }} - path: sbv2_bindings/dist + path: ./crates/sbv2_bindings/dist sdist: runs-on: ubuntu-latest @@ -112,12 +112,12 @@ jobs: with: command: sdist args: --out dist - working-directory: sbv2_bindings + working-directory: ./crates/sbv2_bindings - name: Upload sdist uses: actions/upload-artifact@v4 with: name: wheels-sdist - path: sbv2_bindings/dist + path: ./crates/sbv2_bindings/dist release: name: Release @@ -148,14 +148,14 @@ jobs: - name: Prepare run: | platform=${{ matrix.machine.platform }} - echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV + echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV - name: Docker meta id: meta uses: docker/metadata-action@v5 with: images: | - ${{ env.GHCR_REPO }} + ${{ env.GHCR_REPO }} - name: Login to GHCR uses: docker/login-action@v3 @@ -191,7 +191,7 @@ jobs: path: ${{ runner.temp }}/digests pattern: digests-* merge-multiple: true - + - name: Login to GHCR uses: docker/login-action@v3 with: diff --git a/Cargo.lock b/Cargo.lock index 0e2937d..1b3ac90 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -261,6 +261,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "colorchoice" version = "1.0.3" @@ -928,6 +934,7 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", + "webpki-roots", ] [[package]] @@ -1989,6 +1996,58 @@ dependencies = [ "syn", ] +[[package]] +name = "quinn" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "socket2", + "thiserror 2.0.11", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" +dependencies = [ + "bytes", + "getrandom 0.2.15", + "rand", + "ring", + "rustc-hash", + "rustls", + "rustls-pki-types", + "slab", + "thiserror 2.0.11", + "tinyvec", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-udp" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e46f3055866785f6b92bc6164b76be02ca8f2eb4b002c0354b28cf4c119e5944" +dependencies = [ + "cfg_aliases", + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "quote" version = "1.0.38" @@ -2131,7 +2190,10 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "quinn", + "rustls", "rustls-pemfile", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", @@ -2139,12 +2201,14 @@ dependencies = [ "system-configuration", "tokio", "tokio-native-tls", + "tokio-rustls", "tower", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", + "webpki-roots", "windows-registry", ] @@ -2168,6 +2232,12 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +[[package]] +name = "rustc-hash" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" + [[package]] name = "rustix" version = "0.38.44" @@ -2188,6 +2258,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395" dependencies = [ "once_cell", + "ring", "rustls-pki-types", "rustls-webpki", "subtle", @@ -2208,6 +2279,9 @@ name = "rustls-pki-types" version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" +dependencies = [ + "web-time", +] [[package]] name = "rustls-webpki" @@ -3133,6 +3207,15 @@ dependencies = [ "rustls-pki-types", ] +[[package]] +name = "webpki-roots" +version = "0.26.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "winapi" version = "0.3.9" diff --git a/crates/sbv2_core/Cargo.toml b/crates/sbv2_core/Cargo.toml index 3522ac2..24aecbf 100644 --- a/crates/sbv2_core/Cargo.toml +++ b/crates/sbv2_core/Cargo.toml @@ -41,4 +41,4 @@ aivmx = ["npyz", "base64"] base64 = ["dep:base64"] [build-dependencies] -reqwest = { version = "0.12.12", features = ["blocking"] } +reqwest = { version = "0.12.12", features = ["blocking", "rustls-tls-webpki-roots"], default-features = false }