From d113d7cd7cb63469b900e5560235072ad4b2f987 Mon Sep 17 00:00:00 2001
From: efugier <mail@emilienfugier.net>
Date: Thu, 16 May 2024 16:48:03 +0200
Subject: [PATCH] fix(release_ci): use vendored openssl

---
 .github/workflows/release.yml | 12 ++++++------
 Cargo.lock                    | 11 +++++++++++
 Cross.toml                    | 24 ++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 Cross.toml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f86fca5..15a4bba 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -48,8 +48,8 @@ jobs:
         matrix:
           job:
             - { target: aarch64-unknown-linux-gnu   , os: ubuntu-20.04, use-cross: true }
-            - { target: arm-unknown-linux-gnueabihf , os: ubuntu-20.04, use-cross: true }
-            - { target: arm-unknown-linux-musleabihf, os: ubuntu-20.04, use-cross: true }
+            # - { target: arm-unknown-linux-gnueabihf , os: ubuntu-20.04, use-cross: true }
+            # - { target: arm-unknown-linux-musleabihf, os: ubuntu-20.04, use-cross: true }
             - { target: i686-pc-windows-msvc        , os: windows-2019                  }
             - { target: i686-unknown-linux-gnu      , os: ubuntu-20.04, use-cross: true }
             - { target: i686-unknown-linux-musl     , os: ubuntu-20.04, use-cross: true }
@@ -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/Cross.toml b/Cross.toml
new file mode 100644
index 0000000..9570e21
--- /dev/null
+++ b/Cross.toml
@@ -0,0 +1,24 @@
+[target.aarch64-unknown-linux-gnu]
+pre-build = [
+    "dpkg --add-architecture $CROSS_DEB_ARCH",
+    "apt-get update && apt-get --assume-yes install libssl-dev:$CROSS_DEB_ARCH"
+]
+
+[target.x86_64-unknown-linux-gnu]
+pre-build = [
+    "dpkg --add-architecture $CROSS_DEB_ARCH",
+    "apt-get update && apt-get --assume-yes install libssl-dev:$CROSS_DEB_ARCH"
+]
+
+[target.aarch64-unknown-linux-musl]
+pre-build = [
+    "dpkg --add-architecture $CROSS_DEB_ARCH",
+    "apt-get update && apt-get --assume-yes install libssl-dev:$CROSS_DEB_ARCH"
+]
+
+[target.x86_64-unknown-linux-musl]
+pre-build = [
+    "dpkg --add-architecture $CROSS_DEB_ARCH",
+    "apt-get update && apt-get --assume-yes install libssl-dev:$CROSS_DEB_ARCH"
+]
+