kokoro: Use cmake-3.31.2 on linux and windows (#5918)

KhronosGroup · Dec 13, 2024 · 7cac4f3 · 7cac4f3
1 parent 13b59bf
commit 7cac4f3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/kokoro/scripts/linux/build-docker.sh b/kokoro/scripts/linux/build-docker.sh
@@ -51,7 +51,7 @@ if [ $TOOL != "cmake-smoketest" ]; then
 fi
 
 if [ $TOOL = "cmake" ]; then
-  using cmake-3.17.2
+  using cmake-3.31.2
   using ninja-1.10.0
 
   # Possible configurations are:
@@ -116,7 +116,7 @@ if [ $TOOL = "cmake" ]; then
   cd $KOKORO_ARTIFACTS_DIR
   tar czf install.tgz install
 elif [ $TOOL = "cmake-smoketest" ]; then
-  using cmake-3.17.2
+  using cmake-3.31.2
   using ninja-1.10.0
 
   # Get shaderc.
@@ -157,7 +157,7 @@ elif [ $TOOL = "cmake-smoketest" ]; then
   ctest --output-on-failure -j4
   echo $(date): ctest completed.
 elif [ $TOOL = "cmake-android-ndk" ]; then
-  using cmake-3.17.2
+  using cmake-3.31.2
   using ndk-r25c
   using ninja-1.10.0
 

diff --git a/kokoro/scripts/windows/build.bat b/kokoro/scripts/windows/build.bat
@@ -21,8 +21,8 @@ set SRC=%cd%\github\SPIRV-Tools
 set BUILD_TYPE=%1
 set VS_VERSION=%2
 
-:: Force usage of python 3.6
-set PATH=C:\python36;"C:\Program Files\cmake-3.23.1-windows-x86_64\bin";%PATH%
+:: Force usage of python 3.6, cmake 3.31.2
+set PATH=C:\python36;c:\cmake-3.31.2\bin;%PATH%
 
 :: #########################################
 :: set up msvc build env
@@ -63,6 +63,7 @@ if "%BUILD_TESTS%" == "NO" (
   set CMAKE_FLAGS=-DSPIRV_SKIP_TESTS=ON %CMAKE_FLAGS%
 ) 
 
+cmake --version
 cmake %CMAKE_FLAGS% ..
 
 if %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%