Try fix for building win aarch64 with native-tls

vemonet · Mar 7, 2024 · 0a7bc19 · 0a7bc19
1 parent 60f056a
commit 0a7bc19
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -168,7 +168,7 @@ jobs:
           - os: linux
             manylinux: auto
             target: x86_64
-            interpreter: pypy3.8 pypy3.9 pypy3.10 pypy3.11 pypy3.12
+            interpreter: pypy3.8 pypy3.9 pypy3.10 3.11 3.12
 
           # musllinux
           - os: linux
@@ -185,7 +185,7 @@ jobs:
             target: x86_64
           - os: macos
             target: aarch64
-            interpreter: 3.8 3.9 pypy3.9 pypy3.10 pypy3.11
+            interpreter: 3.8 3.9 pypy3.9 pypy3.10
 
           # windows
           # x86_64 pypy builds are not PGO optimized, i686 not supported by pypy, aarch64 only 3.11 and up, also not PGO optimized
@@ -198,9 +198,9 @@ jobs:
             python-architecture: x86
             interpreter: 3.8 3.9 3.10 3.11 3.12
           # Ring cant target win aarch64 https://github.com/briansmith/ring/issues/1167
-          # - os: windows
-          #   target: aarch64
-          #   interpreter: 3.11 3.12
+          - os: windows
+            target: aarch64
+            interpreter: 3.11 3.12
 
 
     runs-on: ${{ (matrix.os == 'linux' && 'ubuntu') || matrix.os }}-latest

diff --git a/lib/Cargo.toml b/lib/Cargo.toml
@@ -23,12 +23,13 @@ rsa = { version = "0.9.6", default-features = false, features = ["pem", "sha2"]
 openssl-probe = "0.1"
 sophia = { version = "0.8.0", features = ["jsonld"] }
 regex = "1.10"
-reqwest = { version = "0.11", features = ["rustls-tls"], default-features = false }
 serde = { version = "1.0", features = ["derive"] }
 serde_yaml = "0.9"
 chrono = "0.4.35"
 getrandom = { version = "0.2", features = ["js"] }
 rand_core = { version = "0.6", features = ["std"] }
+reqwest = { version = "0.11", default-features = false }
+# reqwest = { version = "0.11", features = ["rustls-tls"], default-features = false }
 # rand = { version = "0.8", features = ["std_rng"], default-features = false }
 # log = { version = "0.0.2", features = ["std"] }
 # futures = "0.3"
@@ -41,3 +42,14 @@ tokio = { version = "1.36", features = ["full"] }
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 futures = "0.3"
 # The JSON-LD parser uses futures::block_on which creates conflict when running in tokio runtime
+
+# Do not use rustls-tls on Windows aarch64 due to Ring dependency https://github.com/briansmith/ring/issues/1167
+[target.'cfg(all(windows, target_arch = "aarch64"))'.dependencies.reqwest]
+version = "0.11"
+default-features = false
+features = ["native-tls"]
+
+[target.'cfg(not(all(windows, target_arch = "aarch64")))'.dependencies.reqwest]
+version = "0.11"
+default-features = false
+features = ["rustls-tls"]