Skip to content

Commit d586741

Browse files
committed
fix: fixed bindgen running in old base images
chore: windows-gnu cross build working now
1 parent ab48626 commit d586741

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

.github/workflows/build-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
matrix:
2424
target:
2525
- i686-unknown-linux-musl
26-
# - x86_64-pc-windows-gnu
26+
- x86_64-pc-windows-gnu
2727
- x86_64-unknown-linux-gnu
2828
- x86_64-unknown-linux-musl
2929
- armv7-unknown-linux-musleabihf

Cross.toml

+10-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22
pre-build = [
33
# https://aws.github.io/aws-lc-rs/requirements/linux.html
44
"apt-get update",
5-
"apt-get install --assume-yes libclang1 cargo",
6-
"CARGO_NET_GIT_FETCH_WITH_CLI=true cargo install --force --locked bindgen-cli",
5+
"apt-get install --assume-yes llvm-5.0-dev libclang-5.0-dev clang-5.0",
6+
"curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable",
7+
". $HOME/.cargo/env",
8+
"cargo install --force --locked bindgen-cli && mv $HOME/.cargo/bin/bindgen /usr/bin",
9+
"rustup self uninstall -y",
710
]
811

912
[build.env]
@@ -13,8 +16,11 @@ passthrough = ["RUSTFLAGS"]
1316
pre-build = [
1417
# Install NASM for rustls, which deps on aws-lc-rs by default, and it needs NASM
1518
"apt-get update",
16-
"apt-get install --assume-yes libclang1 nasm cargo",
17-
"CARGO_NET_GIT_FETCH_WITH_CLI=true cargo install --force --locked bindgen-cli",
19+
"apt-get install --assume-yes llvm-5.0-dev libclang-5.0-dev clang-5.0 nasm",
20+
"curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable",
21+
". $HOME/.cargo/env",
22+
"cargo install --force --locked bindgen-cli && mv $HOME/.cargo/bin/bindgen /usr/bin",
23+
"rustup self uninstall -y",
1824
]
1925

2026
[target.aarch64-unknown-linux-gnu]

0 commit comments

Comments
 (0)