From 03cf4202b08ff41e931e77376604eda5cc2a9da2 Mon Sep 17 00:00:00 2001 From: efugier Date: Thu, 16 May 2024 16:48:03 +0200 Subject: [PATCH] fix(release_ci): use vendored openssl --- .github/workflows/release.yml | 8 ++++---- Cargo.lock | 11 +++++++++++ Cargo.toml | 1 + 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f86fca5..3c00c6f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -159,7 +159,7 @@ jobs: echo "ASSET_PATH=${PKG_STAGING}/${PKG_NAME}" | tee -a $GITHUB_ENV echo "ASSET_SUM=${PKG_STAGING}/${PKG_NAME}.sha256" | tee -a $GITHUB_ENV - - name: Upload release archive - env: - GH_TOKEN: ${{ github.token }} - run: gh release upload ${{ needs.get-release.outputs.smartcat_version }} ${{ env.ASSET_PATH }} ${{ env.ASSET_SUM }} + # - name: Upload release archive + # env: + # GH_TOKEN: ${{ github.token }} + # run: gh release upload ${{ needs.get-release.outputs.smartcat_version }} ${{ env.ASSET_PATH }} ${{ env.ASSET_SUM }} diff --git a/Cargo.lock b/Cargo.lock index aed47a7..44c7202 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -778,6 +778,15 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-src" +version = "300.2.3+3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.102" @@ -786,6 +795,7 @@ checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] @@ -1189,6 +1199,7 @@ dependencies = [ "env_logger", "glob", "log", + "openssl", "reqwest", "serde", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index ff18078..1304a85 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,6 +28,7 @@ env_logger = "0" # device_query = { version = "2", optional = true } reqwest = { version = "0", features = ["json", "blocking", "multipart"] } device_query = "2" +openssl = { version = "0.10", features = ["vendored"] } [dev-dependencies] tempfile = "3"