Skip to content

Commit

Permalink
fix: fixed bindgen running in old base images
Browse files Browse the repository at this point in the history
chore: windows-gnu cross build working now
  • Loading branch information
zonyitoo committed May 25, 2024
1 parent ab48626 commit d586741
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
matrix:
target:
- i686-unknown-linux-musl
# - x86_64-pc-windows-gnu
- x86_64-pc-windows-gnu
- x86_64-unknown-linux-gnu
- x86_64-unknown-linux-musl
- armv7-unknown-linux-musleabihf
Expand Down
14 changes: 10 additions & 4 deletions Cross.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
pre-build = [
# https://aws.github.io/aws-lc-rs/requirements/linux.html
"apt-get update",
"apt-get install --assume-yes libclang1 cargo",
"CARGO_NET_GIT_FETCH_WITH_CLI=true cargo install --force --locked bindgen-cli",
"apt-get install --assume-yes llvm-5.0-dev libclang-5.0-dev clang-5.0",
"curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable",
". $HOME/.cargo/env",
"cargo install --force --locked bindgen-cli && mv $HOME/.cargo/bin/bindgen /usr/bin",
"rustup self uninstall -y",
]

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

[target.aarch64-unknown-linux-gnu]
Expand Down

0 comments on commit d586741

Please sign in to comment.