From 4f4e085d97f7631cee761b9fe001db176b063f90 Mon Sep 17 00:00:00 2001
From: Calvin Prewitt <calvin@jaflabs.com>
Date: Tue, 14 May 2024 14:46:46 -0500
Subject: [PATCH] try with vendored native tls

---
 .github/workflows/publish-binaries.yml |  8 ++------
 Cargo.lock                             | 10 ++++++++++
 Cargo.toml                             |  1 +
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/publish-binaries.yml b/.github/workflows/publish-binaries.yml
index 0d46eb8..78c4b02 100644
--- a/.github/workflows/publish-binaries.yml
+++ b/.github/workflows/publish-binaries.yml
@@ -48,13 +48,11 @@ jobs:
       - uses: actions/checkout@v4
       - name: Install Rust
         run: rustup update stable --no-self-update && rustup default stable && rustup target add ${{ matrix.rust-target }}
-      - run: sudo apt install -y librust-openssl-sys-dev
-        if: matrix.os == 'ubuntu-latest'
       - run: cargo build --release --target ${{ matrix.rust-target }}
         if: ${{ ! matrix.cross }}
       - run: cargo install cross
         if: ${{ matrix.cross }}
-      - run: cross build --release --target ${{ matrix.rust-target }}
+      - run: cross build --release --target ${{ matrix.rust-target }} --features native-tls-vendored
         if: ${{ matrix.cross }}
       - run: mv ./target/${{ matrix.rust-target }}/release/wac.exe ./target/${{ matrix.rust-target }}/release/wac-${{ matrix.rust-target }}
         if: matrix.os == 'windows-latest'
@@ -89,13 +87,11 @@ jobs:
       - uses: actions/checkout@v4
       - name: Install Rust
         run: rustup update stable --no-self-update && rustup default stable && rustup target add ${{ matrix.rust-target }}
-      - run: sudo apt install -y librust-openssl-sys-dev
-        if: matrix.os == 'ubuntu-latest'
       - run: cargo build --release --target ${{ matrix.rust-target }}
         if: ${{ ! matrix.cross }}
       - run: cargo install cross
         if: ${{ matrix.cross }}
-      - run: cross build --release --target ${{ matrix.rust-target }}
+      - run: cross build --release --target ${{ matrix.rust-target }} --features native-tls-vendored
         if: ${{ matrix.cross }}
       - run: mv ./target/${{ matrix.rust-target }}/release/wac.exe ./target/${{ matrix.rust-target }}/release/wac-${{ matrix.rust-target }}
         if: matrix.os == 'windows-latest'
diff --git a/Cargo.lock b/Cargo.lock
index 37e5bab..1ec1ce2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2160,6 +2160,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"
@@ -2168,6 +2177,7 @@ checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
 dependencies = [
  "cc",
  "libc",
+ "openssl-src",
  "pkg-config",
  "vcpkg",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index d685141..242cf70 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -46,6 +46,7 @@ default = ["wit", "registry"]
 wat = ["wac-resolver/wat"]
 wit = ["wac-resolver/wit"]
 registry = ["wac-resolver/registry", "dep:indicatif", "dep:warg-client", "dep:warg-protocol"]
+native-tls-vendored = ["warg-client?/native-tls-vendored"]
 
 [workspace.dependencies]
 wac-parser = { path = "crates/wac-parser", version = "0.1.0", default-features = false }