CI: Use the latest release of CMake

3 files changed, 56 insertions, 2 deletions

diff --git a/scripts/build/p-klee-linux-ubuntu.inc b/scripts/build/p-klee-linux-ubuntu.inc
index f5e6aed2..4967aa3c 100644
--- a/scripts/build/p-klee-linux-ubuntu.inc
+++ b/scripts/build/p-klee-linux-ubuntu.inc
@@ -1,6 +1,25 @@
 install_build_dependencies_klee() {
   apt update -y
 
+  # Add Kitware's certificate for CMake
+  dependencies=(
+    apt-transport-https
+    ca-certificates
+    gnupg
+    lsb-release
+    software-properties-common
+    wget
+  )
+
+  apt -y --no-install-recommends install "${dependencies[@]}"
+  wget -O - "https://apt.kitware.com/keys/kitware-archive-latest.asc" 2> /dev/null \
+      | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg > /dev/null
+
+  # Add CMake repository
+  codename="$(lsb_release --codename --short)"
+  apt-add-repository "deb https://apt.kitware.com/ubuntu/ ${codename} main"
+
+  # Install KLEE's dependencies
   dependencies=(
     build-essential
     gcc-multilib # to generate 32bit
diff --git a/scripts/build/p-libcxx-linux-ubuntu.inc b/scripts/build/p-libcxx-linux-ubuntu.inc
index 8fefd83e..46705c86 100644
--- a/scripts/build/p-libcxx-linux-ubuntu.inc
+++ b/scripts/build/p-libcxx-linux-ubuntu.inc
@@ -1,9 +1,26 @@
 install_build_dependencies_libcxx() { 
   apt-get update -y
 
+  # Add Kitware's certificate for CMake
   dependencies=(
-    build-essential
+    apt-transport-https
     ca-certificates
+    gnupg
+    lsb-release
+    software-properties-common
+    wget
+  )
+
+  apt -y --no-install-recommends install "${dependencies[@]}"
+  wget -O - "https://apt.kitware.com/keys/kitware-archive-latest.asc" 2> /dev/null \
+      | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg > /dev/null
+
+  # Add CMake repository
+  codename="$(lsb_release --codename --short)"
+  apt-add-repository "deb https://apt.kitware.com/ubuntu/ ${codename} main"
+
+  dependencies=(
+    build-essential
     git
     python3
     python3-pip
@@ -15,4 +32,4 @@ install_build_dependencies_libcxx() {
   apt -y --no-install-recommends install "${dependencies[@]}"
 
   pip3 install wllvm
-}
\ No newline at end of file
+}
diff --git a/scripts/build/p-llvm-linux-ubuntu.inc b/scripts/build/p-llvm-linux-ubuntu.inc
index ef055583..0b506314 100644
--- a/scripts/build/p-llvm-linux-ubuntu.inc
+++ b/scripts/build/p-llvm-linux-ubuntu.inc
@@ -2,8 +2,25 @@
 install_build_dependencies_llvm() { 
   apt update -y
 
+  # Add Kitware's certificate for CMake
   dependencies=(
+    apt-transport-https
     ca-certificates
+    gnupg
+    lsb-release
+    software-properties-common
+    wget
+  )
+
+  apt -y --no-install-recommends install "${dependencies[@]}"
+  wget -O - "https://apt.kitware.com/keys/kitware-archive-latest.asc" 2> /dev/null \
+      | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg > /dev/null
+
+  # Add CMake repository
+  codename="$(lsb_release --codename --short)"
+  apt-add-repository "deb https://apt.kitware.com/ubuntu/ ${codename} main"
+
+  dependencies=(
     build-essential
     autoconf
     automake
@@ -11,6 +28,7 @@ install_build_dependencies_llvm() {
     gcc
     g++
     python-dev
+    python3-distutils
     make
     git # To check out code
     zlib1g-dev