Skip to content

Commit 139d0ed

Browse files
authored
CI fixes (#170)
* switch to custom wasi-sdk-27.0-x86_64-linux build The official build requires a glibc version that's too new for Maturin to handle. Signed-off-by: Joel Dice <joel.dice@fermyon.com> * use `rustls-tls` instead of `native-tls` for `reqwest` This avoids the need for a compatible system OpenSSL version on Linux at build time. Signed-off-by: Joel Dice <joel.dice@fermyon.com> --------- Signed-off-by: Joel Dice <joel.dice@fermyon.com>
1 parent bb42371 commit 139d0ed

File tree

3 files changed

+210
-222
lines changed

3 files changed

+210
-222
lines changed

.github/workflows/release.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,11 @@ jobs:
8282
os: "ubuntu-latest",
8383
arch: "amd64",
8484
maturin_target: "x86_64",
85+
# As of this writing, the offical WASI-SDK x86_64-linux builds
86+
# require a newer version of glibc than the manylinux 2_28 Maturin
87+
# Docker build images support. That means we need to use a
88+
# special build made using Ubuntu 18.04 here:
89+
wasiSDK_source: "dicej",
8590
wasiSDK: "x86_64-linux",
8691
extension: "",
8792
buildArgs: "",
@@ -92,6 +97,7 @@ jobs:
9297
os: "ubuntu-latest",
9398
arch: "aarch64",
9499
maturin_target: "aarch64",
100+
wasiSDK_source: "WebAssembly",
95101
wasiSDK: "x86_64-linux",
96102
extension: "",
97103
buildArgs: "--target aarch64-unknown-linux-gnu",
@@ -102,6 +108,7 @@ jobs:
102108
os: "macos-latest",
103109
arch: "amd64",
104110
maturin_target: "x86_64",
111+
wasiSDK_source: "WebAssembly",
105112
wasiSDK: "arm64-macos",
106113
extension: "",
107114
buildArgs: "",
@@ -112,6 +119,7 @@ jobs:
112119
os: "macos-latest",
113120
arch: "aarch64",
114121
maturin_target: "aarch64",
122+
wasiSDK_source: "WebAssembly",
115123
wasiSDK: "arm64-macos",
116124
extension: "",
117125
buildArgs: "--target aarch64-apple-darwin",
@@ -122,6 +130,7 @@ jobs:
122130
os: "windows-latest",
123131
arch: "amd64",
124132
maturin_target: "x64",
133+
wasiSDK_source: "WebAssembly",
125134
wasiSDK: "x86_64-windows",
126135
extension: ".exe",
127136
buildArgs: "",
@@ -179,7 +188,7 @@ jobs:
179188
shell: bash
180189
run: |
181190
cd /tmp
182-
curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION}/wasi-sdk-${WASI_SDK_VERSION}.0-${{ matrix.config.wasiSDK }}.tar.gz
191+
curl -LO https://github.com/${{ matrix.config.wasiSDK_source }}/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION}/wasi-sdk-${WASI_SDK_VERSION}.0-${{ matrix.config.wasiSDK }}.tar.gz
183192
tar xf wasi-sdk-${WASI_SDK_VERSION}.0-${{ matrix.config.wasiSDK }}.tar.gz
184193
185194
- name: Install WASI-SDK

0 commit comments

Comments
 (0)