ci(linux): move bindgen-cli installation into run.bash

rust-lang · Dec 21, 2024 · 66269c4 · 66269c4
1 parent 759ad7d
commit 66269c4
Show file tree

Hide file tree

Showing 17 changed files with 36 additions and 49 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -621,6 +621,7 @@ jobs:
             --env LIBZ_SYS_STATIC=1 \
             --env SKIP_TESTS="${SKIP_TESTS}" \
             --env TARGET="${TARGET}" \
+            --env INSTALL_BINDGEN=1 \
             --init \
             --rm \
             --tty \
@@ -785,6 +786,7 @@ jobs:
             --env LIBZ_SYS_STATIC=1 \
             --env SKIP_TESTS="${SKIP_TESTS}" \
             --env TARGET="${TARGET}" \
+            --env INSTALL_BINDGEN=1 \
             --init \
             --rm \
             --tty \
@@ -971,6 +973,7 @@ jobs:
             --env LIBZ_SYS_STATIC=1 \
             --env SKIP_TESTS="${SKIP_TESTS}" \
             --env TARGET="${TARGET}" \
+            --env INSTALL_BINDGEN=1 \
             --init \
             --rm \
             --tty \

diff --git a/ci/actions-templates/linux-builds-template.yaml b/ci/actions-templates/linux-builds-template.yaml
@@ -137,6 +137,7 @@ jobs: # skip-master skip-pr skip-stable
             --env LIBZ_SYS_STATIC=1 \
             --env SKIP_TESTS="${SKIP_TESTS}" \
             --env TARGET="${TARGET}" \
+            --env INSTALL_BINDGEN=1 \
             --init \
             --rm \
             --tty \

diff --git a/ci/docker/aarch64-unknown-linux-gnu/Dockerfile b/ci/docker/aarch64-unknown-linux-gnu/Dockerfile
@@ -2,9 +2,7 @@ FROM rust-aarch64-unknown-linux-gnu
 
 # Building `aws-lc-rs` for Linux depends on `gcc-multilib`, `libclang` and `bindgen`.
 # See: https://aws.github.io/aws-lc-rs/requirements/linux
-RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev \
-  && curl --proto '=https' --tlsv1.2 -LsSf https://github.com/rust-lang/rust-bindgen/releases/latest/download/bindgen-cli-installer.sh | sh \
-  && mv $HOME/.cargo/bin/bindgen /usr/bin
+RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev
 
 ENV CC_aarch64_unknown_linux_gnu=aarch64-unknown-linux-gnu-gcc \
     CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-unknown-linux-gnu-gcc
diff --git a/ci/docker/aarch64-unknown-linux-musl/Dockerfile b/ci/docker/aarch64-unknown-linux-musl/Dockerfile
@@ -2,9 +2,7 @@ FROM rust-aarch64-unknown-linux-musl
 
 # Building `aws-lc-rs` for Linux depends on `gcc-multilib`, `libclang` and `bindgen`.
 # See: https://aws.github.io/aws-lc-rs/requirements/linux
-RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev \
-  && curl --proto '=https' --tlsv1.2 -LsSf https://github.com/rust-lang/rust-bindgen/releases/latest/download/bindgen-cli-installer.sh | sh \
-  && mv $HOME/.cargo/bin/bindgen /usr/bin
+RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev
 
 ENV CC_aarch64_unknown_linux_musl=aarch64-linux-musl-gcc \
     CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=aarch64-linux-musl-gcc \

diff --git a/ci/docker/android/Dockerfile b/ci/docker/android/Dockerfile
@@ -2,9 +2,7 @@ FROM rust-android
 
 # Building `aws-lc-rs` for Linux depends on `gcc-multilib`, `libclang` and `bindgen`.
 # See: https://aws.github.io/aws-lc-rs/requirements/linux
-RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev \
-  && curl --proto '=https' --tlsv1.2 -LsSf https://github.com/rust-lang/rust-bindgen/releases/latest/download/bindgen-cli-installer.sh | sh \
-  && mv $HOME/.cargo/bin/bindgen /usr/bin
+RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev
 
 ENV PATH=$PATH:/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin \
     ANDROID_NDK=/android/ndk/ \

diff --git a/ci/docker/arm-unknown-linux-gnueabi/Dockerfile b/ci/docker/arm-unknown-linux-gnueabi/Dockerfile
@@ -2,9 +2,7 @@ FROM rust-arm-unknown-linux-gnueabi
 
 # Building `aws-lc-rs` for Linux depends on `gcc-multilib`, `libclang` and `bindgen`.
 # See: https://aws.github.io/aws-lc-rs/requirements/linux
-RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev \
-  && curl --proto '=https' --tlsv1.2 -LsSf https://github.com/rust-lang/rust-bindgen/releases/latest/download/bindgen-cli-installer.sh | sh \
-  && mv $HOME/.cargo/bin/bindgen /usr/bin
+RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev
 
 ENV CC_arm_unknown_linux_gnueabi=arm-unknown-linux-gnueabi-gcc \
     CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER=arm-unknown-linux-gnueabi-gcc
diff --git a/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile b/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile
@@ -2,9 +2,7 @@ FROM rust-arm-unknown-linux-gnueabihf
 
 # Building `aws-lc-rs` for Linux depends on `gcc-multilib`, `libclang` and `bindgen`.
 # See: https://aws.github.io/aws-lc-rs/requirements/linux
-RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev \
-  && curl --proto '=https' --tlsv1.2 -LsSf https://github.com/rust-lang/rust-bindgen/releases/latest/download/bindgen-cli-installer.sh | sh \
-  && mv $HOME/.cargo/bin/bindgen /usr/bin
+RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev
 
 ENV CC_arm_unknown_linux_gnueabihf=arm-unknown-linux-gnueabihf-gcc \
     CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-unknown-linux-gnueabihf-gcc
diff --git a/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile b/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile
@@ -2,9 +2,7 @@ FROM rust-armv7-unknown-linux-gnueabihf
 
 # Building `aws-lc-rs` for Linux depends on `gcc-multilib`, `libclang` and `bindgen`.
 # See: https://aws.github.io/aws-lc-rs/requirements/linux
-RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev \
-  && curl --proto '=https' --tlsv1.2 -LsSf https://github.com/rust-lang/rust-bindgen/releases/latest/download/bindgen-cli-installer.sh | sh \
-  && mv $HOME/.cargo/bin/bindgen /usr/bin
+RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev
 
 ENV CC_armv7_unknown_linux_gnueabihf=armv7-unknown-linux-gnueabihf-gcc \
     CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=armv7-unknown-linux-gnueabihf-gcc
diff --git a/ci/docker/i686-unknown-linux-gnu/Dockerfile b/ci/docker/i686-unknown-linux-gnu/Dockerfile
@@ -1,12 +1,9 @@
 FROM rust-i686-unknown-linux-gnu
 
-# Building `aws-lc-rs` for Linux depends on `gcc-multilib`, `libclang` and `bindgen`.
-# See: https://aws.github.io/aws-lc-rs/requirements/linux
-RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev \
-  && curl --proto '=https' --tlsv1.2 -LsSf https://github.com/rust-lang/rust-bindgen/releases/latest/download/bindgen-cli-installer.sh | sh \
-  && mv $HOME/.cargo/bin/bindgen /usr/bin
-
- # Install `perl-IPC-Cmd` to make OpenSSL v3 happy.
- # See: <https://github.com/sfackler/rust-openssl/issues/1550>
- RUN yum upgrade -y && \
-     yum install -y perl-IPC-Cmd
+# Install `perl-IPC-Cmd` to make OpenSSL v3 happy.
+# See: <https://github.com/sfackler/rust-openssl/issues/1550>
+RUN yum upgrade -y && \
+    yum install -y perl-IPC-Cmd \
+    # Building `aws-lc-rs` for Linux depends on `gcc-multilib`, `libclang` and `bindgen`.
+    # See: https://aws.github.io/aws-lc-rs/requirements/linux
+    glibc-devel.i686 clang-libs
diff --git a/ci/docker/loongarch64-unknown-linux-gnu/Dockerfile b/ci/docker/loongarch64-unknown-linux-gnu/Dockerfile
@@ -2,9 +2,7 @@ FROM rust-loongarch64-unknown-linux-gnu
 
 # Building `aws-lc-rs` for Linux depends on `gcc-multilib`, `libclang` and `bindgen`.
 # See: https://aws.github.io/aws-lc-rs/requirements/linux
-RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev \
-  && curl --proto '=https' --tlsv1.2 -LsSf https://github.com/rust-lang/rust-bindgen/releases/latest/download/bindgen-cli-installer.sh | sh \
-  && mv $HOME/.cargo/bin/bindgen /usr/bin
+RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev
 
 ENV CC_loongarch64_unknown_linux_gnu=loongarch64-unknown-linux-gnu-gcc \
     CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_GNU_LINKER=loongarch64-unknown-linux-gnu-gcc
diff --git a/ci/docker/loongarch64-unknown-linux-musl/Dockerfile b/ci/docker/loongarch64-unknown-linux-musl/Dockerfile
@@ -2,9 +2,7 @@ FROM rust-loongarch64-unknown-linux-musl
 
 # Building `aws-lc-rs` for Linux depends on `gcc-multilib`, `libclang` and `bindgen`.
 # See: https://aws.github.io/aws-lc-rs/requirements/linux
-RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev \
-  && curl --proto '=https' --tlsv1.2 -LsSf https://github.com/rust-lang/rust-bindgen/releases/latest/download/bindgen-cli-installer.sh | sh \
-  && mv $HOME/.cargo/bin/bindgen /usr/bin
+RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev
 
 ENV CC_loongarch64_unknown_linux_musl=loongarch64-unknown-linux-musl-gcc \
     CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_MUSL_LINKER=loongarch64-unknown-linux-musl-gcc
diff --git a/ci/docker/powerpc-unknown-linux-gnu/Dockerfile b/ci/docker/powerpc-unknown-linux-gnu/Dockerfile
@@ -2,9 +2,7 @@ FROM rust-powerpc-unknown-linux-gnu
 
 # Building `aws-lc-rs` for Linux depends on `gcc-multilib`, `libclang` and `bindgen`.
 # See: https://aws.github.io/aws-lc-rs/requirements/linux
-RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev \
-  && curl --proto '=https' --tlsv1.2 -LsSf https://github.com/rust-lang/rust-bindgen/releases/latest/download/bindgen-cli-installer.sh | sh \
-  && mv $HOME/.cargo/bin/bindgen /usr/bin
+RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev
 
 ENV CC_powerpc_unknown_linux_gnu=powerpc-unknown-linux-gnu-gcc \
     CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_LINKER=powerpc-unknown-linux-gnu-gcc
diff --git a/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile b/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile
@@ -2,9 +2,7 @@ FROM rust-powerpc64-unknown-linux-gnu
 
 # Building `aws-lc-rs` for Linux depends on `gcc-multilib`, `libclang` and `bindgen`.
 # See: https://aws.github.io/aws-lc-rs/requirements/linux
-RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev \
-  && curl --proto '=https' --tlsv1.2 -LsSf https://github.com/rust-lang/rust-bindgen/releases/latest/download/bindgen-cli-installer.sh | sh \
-  && mv $HOME/.cargo/bin/bindgen /usr/bin
+RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev
 
 ENV CC_powerpc64_unknown_linux_gnu=powerpc64-unknown-linux-gnu-gcc \
     CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_LINKER=powerpc64-unknown-linux-gnu-gcc
diff --git a/ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile b/ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile
@@ -2,9 +2,7 @@ FROM rust-powerpc64le-unknown-linux-gnu
 
 # Building `aws-lc-rs` for Linux depends on `gcc-multilib`, `libclang` and `bindgen`.
 # See: https://aws.github.io/aws-lc-rs/requirements/linux
-RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev \
-  && curl --proto '=https' --tlsv1.2 -LsSf https://github.com/rust-lang/rust-bindgen/releases/latest/download/bindgen-cli-installer.sh | sh \
-  && mv $HOME/.cargo/bin/bindgen /usr/bin
+RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev
 
 ENV CC_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-gcc \
     CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_LINKER=powerpc64le-linux-gnu-gcc
diff --git a/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile b/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile
@@ -2,9 +2,7 @@ FROM rust-riscv64gc-unknown-linux-gnu
 
 # Building `aws-lc-rs` for Linux depends on `gcc-multilib`, `libclang` and `bindgen`.
 # See: https://aws.github.io/aws-lc-rs/requirements/linux
-RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev \
-  && curl --proto '=https' --tlsv1.2 -LsSf https://github.com/rust-lang/rust-bindgen/releases/latest/download/bindgen-cli-installer.sh | sh \
-  && mv $HOME/.cargo/bin/bindgen /usr/bin
+RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev
 
 ENV CC_riscv64gc_unknown_linux_gnu=riscv64-unknown-linux-gnu-gcc \
     CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_LINKER=riscv64-unknown-linux-gnu-gcc
diff --git a/ci/docker/s390x-unknown-linux-gnu/Dockerfile b/ci/docker/s390x-unknown-linux-gnu/Dockerfile
@@ -2,9 +2,7 @@ FROM rust-s390x-unknown-linux-gnu
 
 # Building `aws-lc-rs` for Linux depends on `gcc-multilib`, `libclang` and `bindgen`.
 # See: https://aws.github.io/aws-lc-rs/requirements/linux
-RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev \
-  && curl --proto '=https' --tlsv1.2 -LsSf https://github.com/rust-lang/rust-bindgen/releases/latest/download/bindgen-cli-installer.sh | sh \
-  && mv $HOME/.cargo/bin/bindgen /usr/bin
+RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev
 
 ENV CC_s390x_unknown_linux_gnu=s390x-ibm-linux-gnu-gcc \
     CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-ibm-linux-gnu-gcc
diff --git a/ci/run.bash b/ci/run.bash
@@ -7,6 +7,18 @@ export RUST_BACKTRACE=1
 rustc -vV
 cargo -vV
 
+if [ -n "$INSTALL_BINDGEN" ]; then
+  if ! curl --proto '=https' --tlsv1.2 -LsSf https://github.com/rust-lang/rust-bindgen/releases/latest/download/bindgen-cli-installer.sh | sh -s -- --no-modify-path \
+    | grep "everything's installed!";
+    # Ignoring exit code since the script might fail to write the receipt after a successful installation.
+  then
+    cargo install --force --locked bindgen-cli
+  fi
+  mkdir "$CARGO_HOME"/bin/bindgen-cli
+  mv "$CARGO_HOME"/bin/bindgen "$CARGO_HOME"/bin/bindgen-cli/
+  export PATH="$CARGO_HOME/bin/bindgen-cli:$PATH"
+fi
+
 
 FEATURES=('--no-default-features' '--features' 'curl-backend,reqwest-native-tls')
 case "$(uname -s)" in