diff --git a/.gitlab-ci/container/build-bindgen.sh b/.gitlab-ci/container/build-bindgen.sh new file mode 100644 index 00000000000..5c1f2a3ae76 --- /dev/null +++ b/.gitlab-ci/container/build-bindgen.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash +# shellcheck disable=SC2086 # we want word splitting + +BINDGEN_VER=0.65.1 +CBINDGEN_VER=0.26.0 + +# bindgen +RUSTFLAGS='-L native=/usr/local/lib' cargo install \ + bindgen-cli --version ${BINDGEN_VER} \ + --locked \ + -j ${FDO_CI_CONCURRENT:-4} \ + --root /usr/local + +# cbindgen +RUSTFLAGS='-L native=/usr/local/lib' cargo install \ + cbindgen --version ${CBINDGEN_VER} \ + --locked \ + -j ${FDO_CI_CONCURRENT:-4} \ + --root /usr/local + diff --git a/.gitlab-ci/container/debian/arm64_build.sh b/.gitlab-ci/container/debian/arm64_build.sh index 106677c3403..89d25326276 100644 --- a/.gitlab-ci/container/debian/arm64_build.sh +++ b/.gitlab-ci/container/debian/arm64_build.sh @@ -99,19 +99,7 @@ arch=armhf . .gitlab-ci/container/build-rust.sh -# install bindgen -RUSTFLAGS='-L native=/usr/local/lib' cargo install \ - bindgen-cli --version 0.65.1 \ - --locked \ - -j ${FDO_CI_CONCURRENT:-4} \ - --root /usr/local - -# install cbindgen -RUSTFLAGS='-L native=/usr/local/lib' cargo install \ - cbindgen --version 0.26.0 \ - --locked \ - -j ${FDO_CI_CONCURRENT:-4} \ - --root /usr/local +. .gitlab-ci/container/build-bindgen.sh apt-get purge -y "${EPHEMERAL[@]}" diff --git a/.gitlab-ci/container/debian/x86_64_build.sh b/.gitlab-ci/container/debian/x86_64_build.sh index b41223e38bf..cc3491a4fae 100644 --- a/.gitlab-ci/container/debian/x86_64_build.sh +++ b/.gitlab-ci/container/debian/x86_64_build.sh @@ -81,22 +81,10 @@ rm -rf $XORGMACROS_VERSION . .gitlab-ci/container/build-directx-headers.sh +. .gitlab-ci/container/build-bindgen.sh + python3 -m pip install --break-system-packages -r .gitlab-ci/lava/requirements.txt -# install bindgen -RUSTFLAGS='-L native=/usr/local/lib' cargo install \ - bindgen-cli --version 0.65.1 \ - --locked \ - -j ${FDO_CI_CONCURRENT:-4} \ - --root /usr/local - -# install cbindgen -RUSTFLAGS='-L native=/usr/local/lib' cargo install \ - cbindgen --version 0.26.0 \ - --locked \ - -j ${FDO_CI_CONCURRENT:-4} \ - --root /usr/local - ############### Uninstall the build software apt-get purge -y "${EPHEMERAL[@]}"