From 3e72019ee7518a81e5d950c6cb00bbc8777f26b5 Mon Sep 17 00:00:00 2001 From: Vincent Emonet Date: Thu, 7 Mar 2024 10:22:43 +0100 Subject: [PATCH] try building windows aarch64 with only py 3.11 --- .github/workflows/build.yml | 14 ++++++++------ lib/Cargo.toml | 19 ++++++++++--------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 76c159a..008dae0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -152,10 +152,10 @@ jobs: target: i686 - os: linux manylinux: auto - target: aarch64 + target: aarch64 # -bit ARM - os: linux manylinux: auto - target: armv7 + target: armv7 # 32-bit ARM interpreter: 3.8 3.9 3.10 3.11 3.12 - os: linux manylinux: auto @@ -195,18 +195,20 @@ jobs: target: i686 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 + # maturin failed Caused by: Failed to find a PyPy 3.8 interpreter in known sysconfig + - os: windows + target: aarch64 + interpreter: "3.11" # interpreter: 3.9 3.10 3.11 3.12 runs-on: ${{ (matrix.os == 'linux' && 'ubuntu') || matrix.os }}-latest steps: - uses: actions/checkout@v4 - uses: docker/setup-qemu-action@v3 + if: matrix.os == 'linux' && matrix.target == 'aarch64' with: platforms: linux/${{ matrix.target }} - if: matrix.os == 'linux' && matrix.target == 'aarch64' + - uses: actions/setup-python@v5 with: python-version: '3.11' diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 9dc37bd..7323a7b 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -28,8 +28,9 @@ 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", features = ["rustls-tls"], default-features = false } +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" @@ -44,12 +45,12 @@ 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(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"] +[target.'cfg(not(all(windows, target_arch = "aarch64")))'.dependencies.reqwest] +version = "0.11" +default-features = false +features = ["rustls-tls"]