From 6a05d107ca8de32e9f9709e3284019d1068ae84e Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 17 Aug 2022 17:32:25 -0400
Subject: ci: add CMake external build dependencies to Debian and Fedora base
 images

---
 .gitlab/ci/docker/debian10-aarch64/install_deps.sh | 14 ++++++++++++++
 .gitlab/ci/docker/debian10/install_deps.sh         | 14 ++++++++++++++
 .gitlab/ci/docker/fedora36/install_deps.sh         | 14 ++++++++++++++
 .gitlab/os-linux.yml                               |  6 +++---
 4 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/.gitlab/ci/docker/debian10-aarch64/install_deps.sh b/.gitlab/ci/docker/debian10-aarch64/install_deps.sh
index 3dd814d..9a98538 100755
--- a/.gitlab/ci/docker/debian10-aarch64/install_deps.sh
+++ b/.gitlab/ci/docker/debian10-aarch64/install_deps.sh
@@ -14,6 +14,20 @@ apt-get install -y \
     curl \
     git
 
+# Install optional external build dependencies.
+apt-get install -y \
+    libarchive-dev \
+    libbz2-dev \
+    libcurl4-gnutls-dev \
+    libexpat1-dev \
+    libjsoncpp-dev \
+    liblzma-dev \
+    libncurses-dev \
+    librhash-dev \
+    libuv1-dev \
+    libzstd-dev \
+    zlib1g-dev
+
 # Install iwyu runtime deps.
 apt-get install -y \
     clang-6.0 \
diff --git a/.gitlab/ci/docker/debian10/install_deps.sh b/.gitlab/ci/docker/debian10/install_deps.sh
index f796816..36ef508 100755
--- a/.gitlab/ci/docker/debian10/install_deps.sh
+++ b/.gitlab/ci/docker/debian10/install_deps.sh
@@ -14,6 +14,20 @@ apt-get install -y \
     curl \
     git
 
+# Install optional external build dependencies.
+apt-get install -y \
+    libarchive-dev \
+    libbz2-dev \
+    libcurl4-gnutls-dev \
+    libexpat1-dev \
+    libjsoncpp-dev \
+    liblzma-dev \
+    libncurses-dev \
+    librhash-dev \
+    libuv1-dev \
+    libzstd-dev \
+    zlib1g-dev
+
 # Install iwyu runtime deps.
 apt-get install -y \
     clang-6.0 \
diff --git a/.gitlab/ci/docker/fedora36/install_deps.sh b/.gitlab/ci/docker/fedora36/install_deps.sh
index b8ddfb9..141e540 100755
--- a/.gitlab/ci/docker/fedora36/install_deps.sh
+++ b/.gitlab/ci/docker/fedora36/install_deps.sh
@@ -17,6 +17,20 @@ dnf install --setopt=install_weak_deps=False -y \
     git-core \
     make
 
+# Install optional external build dependencies.
+dnf install --setopt=install_weak_deps=False -y \
+    bzip2-devel \
+    expat-devel \
+    jsoncpp-devel \
+    libarchive-devel \
+    libcurl-devel \
+    libuv-devel \
+    libuv-devel \
+    libzstd-devel \
+    rhash-devel \
+    xz-devel \
+    zlib-devel
+
 # Install documentation tools.
 dnf install --setopt=install_weak_deps=False -y \
     python3-sphinx \
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index 37e5c22..ce396da 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -45,7 +45,7 @@
 ### Debian
 
 .debian10:
-    image: "kitware/cmake:ci-debian10-x86_64-2022-06-21"
+    image: "kitware/cmake:ci-debian10-x86_64-2022-08-17"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -60,7 +60,7 @@
         CMAKE_CI_NO_INSTALL: 1
 
 .debian10_aarch64:
-    image: "kitware/cmake:ci-debian10-aarch64-2022-06-21"
+    image: "kitware/cmake:ci-debian10-aarch64-2022-08-17"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -69,7 +69,7 @@
 ### Fedora
 
 .fedora36:
-    image: "kitware/cmake:ci-fedora36-x86_64-2022-06-21"
+    image: "kitware/cmake:ci-fedora36-x86_64-2022-08-17"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"
-- 
cgit v0.12