Skip to content

Commit e15ac61

Browse files
dneto0dneto0
authored
kokoro: Add VS 2022 scripts, remove VS 2017 scripts (#5930)
1 parent 8806126 commit e15ac61

File tree

7 files changed

+71
-13
lines changed

7 files changed

+71
-13
lines changed

‎kokoro/scripts/windows/build.bat‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,12 @@ set PATH=C:\python312;c:\cmake-3.31.2\bin;%PATH%
2727
:: #########################################
2828
:: set up msvc build env
2929
:: #########################################
30-
if %VS_VERSION% == 2017 (
31-
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
32-
echo "Using VS 2017..."
33-
34-
:: RE2 does not support VS2017, we we must disable tests.
35-
set BUILD_TESTS=NO
36-
) else if %VS_VERSION% == 2019 (
30+
if %VS_VERSION% == 2019 (
3731
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
3832
echo "Using VS 2019..."
33+
) else if %VS_VERSION% == 2022 (
34+
call "C:\Program Files\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat" x64
35+
echo "Using VS 2022..."
3936
)
4037

4138
cd %SRC%

‎kokoro/windows-msvc-2022-debug/build.bat‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
:: Copyright (c) 2023 Google LLC
2+
::
3+
:: Licensed under the Apache License, Version 2.0 (the "License");
4+
:: you may not use this file except in compliance with the License.
5+
:: You may obtain a copy of the License at
6+
::
7+
:: http://www.apache.org/licenses/LICENSE-2.0
8+
::
9+
:: Unless required by applicable law or agreed to in writing, software
10+
:: distributed under the License is distributed on an "AS IS" BASIS,
11+
:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
:: See the License for the specific language governing permissions and
13+
:: limitations under the License.
14+
::
15+
:: Windows Build Script.
16+
17+
@echo on
18+
19+
:: Find out the directory of the common build script.
20+
set SCRIPT_DIR=%~dp0
21+
22+
:: Call with correct parameter
23+
call %SCRIPT_DIR%\..\scripts\windows\build.bat Debug 2019

‎kokoro/windows-msvc-2022-debug/continuous.cfg‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Copyright (c) 2023 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
# Continuous build configuration.
16+
build_file: "SPIRV-Tools/kokoro/windows-msvc-2019-debug/build.bat"
17+
18+
action {
19+
define_artifacts {
20+
regex: "install.zip"
21+
}
22+
}

‎kokoro/windows-msvc-2022-debug/presubmit.cfg‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Copyright (c) 2023 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
# Presubmit build configuration.
16+
build_file: "SPIRV-Tools/kokoro/windows-msvc-2019-debug/build.bat"

kokoro/windows-msvc-2017-release/build.bat renamed to kokoro/windows-msvc-2022-release/build.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
:: Copyright (c) 2018 Google LLC.
1+
:: Copyright (c) 2025 Google LLC
22
::
33
:: Licensed under the Apache License, Version 2.0 (the "License");
44
:: you may not use this file except in compliance with the License.
@@ -20,5 +20,5 @@
2020
set SCRIPT_DIR=%~dp0
2121

2222
:: Call with correct parameter
23-
call %SCRIPT_DIR%\..\scripts\windows\build.bat RelWithDebInfo 2017
23+
call %SCRIPT_DIR%\..\scripts\windows\build.bat RelWithDebInfo 2022
2424

kokoro/windows-msvc-2017-release/continuous.cfg renamed to kokoro/windows-msvc-2022-release/continuous.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2018 Google LLC.
1+
# Copyright (c) 2025 Google LLC.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# Continuous build configuration.
16-
build_file: "SPIRV-Tools/kokoro/windows-msvc-2017-release/build.bat"
16+
build_file: "SPIRV-Tools/kokoro/windows-msvc-2022-release/build.bat"
1717

1818
action {
1919
define_artifacts {

kokoro/windows-msvc-2017-release/presubmit.cfg renamed to kokoro/windows-msvc-2022-release/presubmit.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2018 Google LLC.
1+
# Copyright (c) 2025 Google LLC.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -13,4 +13,4 @@
1313
# limitations under the License.
1414

1515
# Presubmit build configuration.
16-
build_file: "SPIRV-Tools/kokoro/windows-msvc-2017-release/build.bat"
16+
build_file: "SPIRV-Tools/kokoro/windows-msvc-2022-release/build.bat"

0 commit comments

Comments
 (0)