From 4cec0391a7912a7ccc48c425e65fabdbf22bb810 Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Tue, 11 Oct 2022 21:43:55 -0700
Subject: [PATCH] CI: on Ubuntu 18.04, install CMake from Kitware instead of
 Apt

This moves the CMake version available on this platform from 3.10.2 to 3.24.2.
The new CMake floor is 3.16.3, determined by Ubuntu 20.04.

Gitlab: #2290
---
 .gitlab-ci.yml             | 2 ++
 ci/ubuntu-18.04/Dockerfile | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5389528fe..473bc05e1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -669,6 +669,7 @@ ubuntu-18.04-cmake-build:
           artifacts: false
     before_script:
         - export build_system="cmake"
+        - export PATH=/opt/cmake/bin:${PATH}
         # fail on any compiler warnings
         - export CFLAGS=-Werror
         - export CXXFLAGS=-Werror
@@ -1076,6 +1077,7 @@ ubuntu-18.04-cmake-test:
     <<: *linux_test_definition
     before_script:
         - export build_system="cmake"
+        - export PATH=/opt/cmake/bin:${PATH}
         - python3 gen_version.py --output GRAPHVIZ_VERSION
     needs:
         - job: "ubuntu-18.04-cmake-build"
diff --git a/ci/ubuntu-18.04/Dockerfile b/ci/ubuntu-18.04/Dockerfile
index 5d1dffbea..9d075a090 100644
--- a/ci/ubuntu-18.04/Dockerfile
+++ b/ci/ubuntu-18.04/Dockerfile
@@ -8,7 +8,6 @@ RUN apt-get update -y \
 && apt-get install --no-install-recommends -y \
 # Development tools
 build-essential \
-cmake \
 git \
 pkg-config \
 autoconf \
@@ -80,8 +79,13 @@ tcl-dev \
 ksh \
 python3-pip \
 python3-setuptools \
+wget \
 # install Python dependencies
 && python3 -m pip install --user --upgrade pip \
 && python3 -m pip install --user --requirement requirements.txt \
+&& wget https://github.com/Kitware/CMake/releases/download/v3.24.2/cmake-3.24.2-linux-x86_64.sh \
+&& mkdir -p /opt/cmake \
+&& /bin/sh ./cmake-3.24.2-linux-x86_64.sh --exclude-subdir --prefix=/opt/cmake --skip-license \
+&& rm cmake-3.24.2-linux-x86_64.sh \
 # Clean up
 && rm -rf /var/lib/apt/lists/*
-- 
2.40.0