diff --git a/.github/workflows/cli-ci.yml b/.github/workflows/cli-ci.yml index 206a65c..3752e56 100644 --- a/.github/workflows/cli-ci.yml +++ b/.github/workflows/cli-ci.yml @@ -19,7 +19,7 @@ jobs: include: - os: ubuntu-latest target: x86_64-unknown-linux-gnu -# TODO: Implement +# TODO: Implement https://github.com/doseiai/dosei/issues/62 # - os: ubuntu-latest # target: aarch64-unknown-linux-gnu - os: macos-latest @@ -63,7 +63,7 @@ jobs: - name: Upload Zip uses: actions/upload-artifact@v4 with: - name: dosei + name: dosei-${{ matrix.target }} path: dosei-${{ matrix.target }}.zip release: @@ -74,7 +74,8 @@ jobs: steps: - uses: actions/download-artifact@v4 with: - name: dosei + pattern: dosei-* + merge-multiple: true - name: Release uses: softprops/action-gh-release@v2 with: diff --git a/Cargo.lock b/Cargo.lock index cdb77d8..7a170a1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -809,7 +809,7 @@ dependencies = [ "ignore", "once_cell", "regex", - "reqwest", + "reqwest 0.12.0", "serde", "serde_json", "sysinfo", @@ -869,7 +869,7 @@ dependencies = [ "rand", "rcgen", "regex", - "reqwest", + "reqwest 0.11.23", "serde", "serde_json", "sha2", @@ -1521,11 +1521,27 @@ dependencies = [ "tokio-native-tls", ] +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper 1.1.0", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + [[package]] name = "hyper-util" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdea9aac0dbe5a9240d68cfd9501e2db94222c6dc06843e06640b9e07f0fdc67" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" dependencies = [ "bytes", "futures-channel", @@ -2710,7 +2726,48 @@ dependencies = [ "http 0.2.11", "http-body 0.4.6", "hyper 0.14.28", - "hyper-tls", + "hyper-tls 0.5.0", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "system-configuration", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "reqwest" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58b48d98d932f4ee75e541614d32a7f44c889b72bd9c2e04d95edd135989df88" +dependencies = [ + "base64 0.21.5", + "bytes", + "encoding_rs", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.4.0", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.1.0", + "hyper-tls 0.6.0", + "hyper-util", "ipnet", "js-sys", "log", @@ -2720,9 +2777,11 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index f9279b3..18af9a4 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -17,11 +17,11 @@ once_cell = "1.19.0" home = "0.5.9" flate2 = "1.0.28" tar = "0.4.40" -reqwest = { version = "0.11.23", features = ["blocking", "json", "multipart"] } +reqwest = { version = "0.12", features = ["blocking", "json", "multipart"] } sysinfo = { version = "0.30.5" } webbrowser = { version = "0.8.12" } tiny_http = { version = "0.12.0" } ignore = { version = "0.4.22" } regex = "1.10.3" -git2 = "0.18.1" +git2 = { version = "0.18.1",features = ["vendored-openssl"] } tempfile = "3.10.1" diff --git a/doseid/Cargo.toml b/doseid/Cargo.toml index 93d2977..641a105 100644 --- a/doseid/Cargo.toml +++ b/doseid/Cargo.toml @@ -55,7 +55,7 @@ instant-acme = "0.4.2" cached = "0.49.2" trust-dns-resolver = "0.23.2" rcgen = "0.12.1" -openssl = { version = "0.10.64",features = ["vendored"] } +openssl = { version = "0.10", features = ["vendored"] } [dev-dependencies] futures = "0.3.30"