From 923a0a727bfd59adf20fcd41ffb56cdb6d5ae64a Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Mon, 8 Apr 2024 12:22:20 -0500
Subject: [PATCH] ci: Add cbindgen to the build images

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27397>
---
 .gitlab-ci/container/debian/x86_64_build.sh | 7 +++++++
 .gitlab-ci/container/fedora/x86_64_build.sh | 1 +
 .gitlab-ci/image-tags.yml                   | 4 ++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci/container/debian/x86_64_build.sh b/.gitlab-ci/container/debian/x86_64_build.sh
index 258ae3f612b7c..02fa1ba5c5d31 100644
--- a/.gitlab-ci/container/debian/x86_64_build.sh
+++ b/.gitlab-ci/container/debian/x86_64_build.sh
@@ -90,6 +90,13 @@ RUSTFLAGS='-L native=/usr/local/lib' cargo install \
   -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[@]}"
diff --git a/.gitlab-ci/container/fedora/x86_64_build.sh b/.gitlab-ci/container/fedora/x86_64_build.sh
index 9ddaf06ff56fe..05b7aae857de9 100644
--- a/.gitlab-ci/container/fedora/x86_64_build.sh
+++ b/.gitlab-ci/container/fedora/x86_64_build.sh
@@ -27,6 +27,7 @@ EPHEMERAL=(
 DEPS=(
     bindgen
     bison
+    cbindgen
     ccache
     clang-devel
     flex
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index fcaa0c1a96e85..d1a362163256d 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -16,7 +16,7 @@ variables:
    DEBIAN_BASE_TAG: "20240401-wlproto"
 
    DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
-   DEBIAN_BUILD_TAG: "20240401-wlproto"
+   DEBIAN_BUILD_TAG: "20240408-cbindgen"
 
    DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
 
@@ -31,7 +31,7 @@ variables:
 
    ALPINE_X86_64_BUILD_TAG: "20240401-wlproto"
    ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto"
-   FEDORA_X86_64_BUILD_TAG: "20240401-wlproto"
+   FEDORA_X86_64_BUILD_TAG: "20240408-cbindgen"
    KERNEL_TAG: "v6.6.21-mesa-19fc"
    KERNEL_REPO: "gfx-ci/linux"
    PKG_REPO_REV: "3cc12a2a"