Kokoro: update CMake to latest version
This is so that we can require CMake 3.13 in order to use target_link_options in
a future change.
Bug: b/145758253
Change-Id: Ia01743395453160ae658cc507499a68a79d4eede
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/44088
Tested-by: Antonio Maiorano <amaiorano@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
diff --git a/tests/kokoro/gcp_ubuntu/continuous.sh b/tests/kokoro/gcp_ubuntu/continuous.sh
index f09a0cf..e4eba18 100755
--- a/tests/kokoro/gcp_ubuntu/continuous.sh
+++ b/tests/kokoro/gcp_ubuntu/continuous.sh
@@ -5,10 +5,18 @@
set -e # Fail on any error.
set -x # Display commands being run.
+# Update CMake
+sudo aptitude purge -yq cmake
+wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | sudo apt-key add -
+sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ xenial main'
+sudo aptitude update -yq
+sudo aptitude install -yq cmake
+cmake --version
+
# Specify we want to build with GCC 7
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-sudo apt-get update
-sudo aptitude install -y gcc-7 g++-7
+sudo aptitude update -yq
+sudo aptitude install -yq gcc-7 g++-7
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 100 --slave /usr/bin/g++ g++ /usr/bin/g++-7
sudo update-alternatives --set gcc "/usr/bin/gcc-7"
diff --git a/tests/kokoro/gcp_windows/continuous.bat b/tests/kokoro/gcp_windows/continuous.bat
index b5e8106..ec9b05c 100644
--- a/tests/kokoro/gcp_windows/continuous.bat
+++ b/tests/kokoro/gcp_windows/continuous.bat
@@ -20,6 +20,10 @@
cd %SRC%\build
if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
+rem Update CMake
+choco upgrade cmake -y --limit-output --no-progress
+cmake --version
+
cmake .. ^
-G "Visual Studio 15 2017 Win64" ^
-Thost=x64 ^
diff --git a/tests/kokoro/macos/continuous.sh b/tests/kokoro/macos/continuous.sh
index 80b0bfb..7778b06 100755
--- a/tests/kokoro/macos/continuous.sh
+++ b/tests/kokoro/macos/continuous.sh
@@ -5,6 +5,8 @@
# Display commands being run.
set -x
+cmake --version
+
cd git/SwiftShader
mkdir -p build && cd build
