Skip to content

Commit bfdc2fb

Browse files
rami3lrami3l
committed
ci(linux): move bindgen-cli installation into run.bash 
1 parent 7af10e2 commit bfdc2fb

File tree

17 files changed

+36
-49
lines changed

17 files changed

+36
-49
lines changed

‎.github/workflows/ci.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,7 @@ jobs:
633633
--env LIBZ_SYS_STATIC=1 \
634634
--env SKIP_TESTS="${SKIP_TESTS}" \
635635
--env TARGET="${TARGET}" \
636+
--env INSTALL_BINDGEN=1 \
636637
--init \
637638
--rm \
638639
--tty \
@@ -797,6 +798,7 @@ jobs:
797798
--env LIBZ_SYS_STATIC=1 \
798799
--env SKIP_TESTS="${SKIP_TESTS}" \
799800
--env TARGET="${TARGET}" \
801+
--env INSTALL_BINDGEN=1 \
800802
--init \
801803
--rm \
802804
--tty \
@@ -983,6 +985,7 @@ jobs:
983985
--env LIBZ_SYS_STATIC=1 \
984986
--env SKIP_TESTS="${SKIP_TESTS}" \
985987
--env TARGET="${TARGET}" \
988+
--env INSTALL_BINDGEN=1 \
986989
--init \
987990
--rm \
988991
--tty \

‎ci/actions-templates/linux-builds-template.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ jobs: # skip-master skip-pr skip-stable
137137
--env LIBZ_SYS_STATIC=1 \
138138
--env SKIP_TESTS="${SKIP_TESTS}" \
139139
--env TARGET="${TARGET}" \
140+
--env INSTALL_BINDGEN=1 \
140141
--init \
141142
--rm \
142143
--tty \

‎ci/docker/aarch64-unknown-linux-gnu/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ FROM rust-aarch64-unknown-linux-gnu
22

33
# Building `aws-lc-rs` for Linux depends on `gcc-multilib`, `libclang` and `bindgen`.
44
# See: https://aws.github.io/aws-lc-rs/requirements/linux
5-
RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev \
6-
&& curl --proto '=https' --tlsv1.2 -LsSf https://github.com/rust-lang/rust-bindgen/releases/latest/download/bindgen-cli-installer.sh | sh \
7-
&& mv $HOME/.cargo/bin/bindgen /usr/bin
5+
RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev
86

97
ENV CC_aarch64_unknown_linux_gnu=aarch64-unknown-linux-gnu-gcc \
108
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-unknown-linux-gnu-gcc

‎ci/docker/aarch64-unknown-linux-musl/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ FROM rust-aarch64-unknown-linux-musl
22

33
# Building `aws-lc-rs` for Linux depends on `gcc-multilib`, `libclang` and `bindgen`.
44
# See: https://aws.github.io/aws-lc-rs/requirements/linux
5-
RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev \
6-
&& curl --proto '=https' --tlsv1.2 -LsSf https://github.com/rust-lang/rust-bindgen/releases/latest/download/bindgen-cli-installer.sh | sh \
7-
&& mv $HOME/.cargo/bin/bindgen /usr/bin
5+
RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev
86

97
ENV CC_aarch64_unknown_linux_musl=aarch64-linux-musl-gcc \
108
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=aarch64-linux-musl-gcc \

‎ci/docker/android/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ FROM rust-android
22

33
# Building `aws-lc-rs` for Linux depends on `gcc-multilib`, `libclang` and `bindgen`.
44
# See: https://aws.github.io/aws-lc-rs/requirements/linux
5-
RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev \
6-
&& curl --proto '=https' --tlsv1.2 -LsSf https://github.com/rust-lang/rust-bindgen/releases/latest/download/bindgen-cli-installer.sh | sh \
7-
&& mv $HOME/.cargo/bin/bindgen /usr/bin
5+
RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev
86

97
ENV PATH=$PATH:/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin \
108
ANDROID_NDK=/android/ndk/ \

‎ci/docker/arm-unknown-linux-gnueabi/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ FROM rust-arm-unknown-linux-gnueabi
22

33
# Building `aws-lc-rs` for Linux depends on `gcc-multilib`, `libclang` and `bindgen`.
44
# See: https://aws.github.io/aws-lc-rs/requirements/linux
5-
RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev \
6-
&& curl --proto '=https' --tlsv1.2 -LsSf https://github.com/rust-lang/rust-bindgen/releases/latest/download/bindgen-cli-installer.sh | sh \
7-
&& mv $HOME/.cargo/bin/bindgen /usr/bin
5+
RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev
86

97
ENV CC_arm_unknown_linux_gnueabi=arm-unknown-linux-gnueabi-gcc \
108
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER=arm-unknown-linux-gnueabi-gcc

‎ci/docker/arm-unknown-linux-gnueabihf/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ FROM rust-arm-unknown-linux-gnueabihf
22

33
# Building `aws-lc-rs` for Linux depends on `gcc-multilib`, `libclang` and `bindgen`.
44
# See: https://aws.github.io/aws-lc-rs/requirements/linux
5-
RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev \
6-
&& curl --proto '=https' --tlsv1.2 -LsSf https://github.com/rust-lang/rust-bindgen/releases/latest/download/bindgen-cli-installer.sh | sh \
7-
&& mv $HOME/.cargo/bin/bindgen /usr/bin
5+
RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev
86

97
ENV CC_arm_unknown_linux_gnueabihf=arm-unknown-linux-gnueabihf-gcc \
108
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-unknown-linux-gnueabihf-gcc

‎ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ FROM rust-armv7-unknown-linux-gnueabihf
22

33
# Building `aws-lc-rs` for Linux depends on `gcc-multilib`, `libclang` and `bindgen`.
44
# See: https://aws.github.io/aws-lc-rs/requirements/linux
5-
RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev \
6-
&& curl --proto '=https' --tlsv1.2 -LsSf https://github.com/rust-lang/rust-bindgen/releases/latest/download/bindgen-cli-installer.sh | sh \
7-
&& mv $HOME/.cargo/bin/bindgen /usr/bin
5+
RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev
86

97
ENV CC_armv7_unknown_linux_gnueabihf=armv7-unknown-linux-gnueabihf-gcc \
108
CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=armv7-unknown-linux-gnueabihf-gcc

‎ci/docker/i686-unknown-linux-gnu/Dockerfile

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
FROM rust-i686-unknown-linux-gnu
22

3-
# Building `aws-lc-rs` for Linux depends on `gcc-multilib`, `libclang` and `bindgen`.
4-
# See: https://aws.github.io/aws-lc-rs/requirements/linux
5-
RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev \
6-
&& curl --proto '=https' --tlsv1.2 -LsSf https://github.com/rust-lang/rust-bindgen/releases/latest/download/bindgen-cli-installer.sh | sh \
7-
&& mv $HOME/.cargo/bin/bindgen /usr/bin
8-
9-
# Install `perl-IPC-Cmd` to make OpenSSL v3 happy.
10-
# See: <https://github.com/sfackler/rust-openssl/issues/1550>
11-
RUN yum upgrade -y && \
12-
yum install -y perl-IPC-Cmd
3+
# Install `perl-IPC-Cmd` to make OpenSSL v3 happy.
4+
# See: <https://github.com/sfackler/rust-openssl/issues/1550>
5+
RUN yum upgrade -y && \
6+
yum install -y perl-IPC-Cmd \
7+
# Building `aws-lc-rs` for Linux depends on `gcc-multilib`, `libclang` and `bindgen`.
8+
# See: https://aws.github.io/aws-lc-rs/requirements/linux
9+
glibc-devel.i686 clang-libs

‎ci/docker/loongarch64-unknown-linux-gnu/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ FROM rust-loongarch64-unknown-linux-gnu
22

33
# Building `aws-lc-rs` for Linux depends on `gcc-multilib`, `libclang` and `bindgen`.
44
# See: https://aws.github.io/aws-lc-rs/requirements/linux
5-
RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev \
6-
&& curl --proto '=https' --tlsv1.2 -LsSf https://github.com/rust-lang/rust-bindgen/releases/latest/download/bindgen-cli-installer.sh | sh \
7-
&& mv $HOME/.cargo/bin/bindgen /usr/bin
5+
RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev
86

97
ENV CC_loongarch64_unknown_linux_gnu=loongarch64-unknown-linux-gnu-gcc \
108
CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_GNU_LINKER=loongarch64-unknown-linux-gnu-gcc

0 commit comments

Comments
 (0)