Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Dec 13, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions kokoro/scripts/linux/build-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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

Expand Down
5 changes: 3 additions & 2 deletions kokoro/scripts/windows/build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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%
Expand Down
Loading