From d586741c8acf0f4fe238754c131416a0d2d34477 Mon Sep 17 00:00:00 2001 From: zonyitoo Date: Sun, 26 May 2024 01:48:29 +0800 Subject: [PATCH] fix: fixed bindgen running in old base images chore: windows-gnu cross build working now --- .github/workflows/build-release.yml | 2 +- Cross.toml | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 5a2d07cfd1cb..17b97643c0ec 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -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 diff --git a/Cross.toml b/Cross.toml index 3a344fd484e8..aafcef55cff4 100644 --- a/Cross.toml +++ b/Cross.toml @@ -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] @@ -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]