Skip to content

Commit

Permalink
kokoro: remove MSVC-2019-debug, add VS2022 release and debug (#1436)
Browse files Browse the repository at this point in the history
  • Loading branch information
dneto0 authored Jan 10, 2025
1 parent dedb128 commit 1e65d18
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 13 deletions.
12 changes: 3 additions & 9 deletions kokoro/scripts/windows/build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,9 @@ python utils/fetch_sources.py
if %VS_VERSION% == 2019 (
set GENERATOR="Visual Studio 16 2019"
echo "Using VS 2019..."
) else if %VS_VERSION% == 2017 (
set GENERATOR="Visual Studio 15 2017 Win64"
echo "Using VS 2017..."
) else if %VS_VERSION% == 2015 (
set GENERATOR="Visual Studio 14 2015 Win64"
echo "Using VS 2015..."
) else if %VS_VERSION% == 2013 (
set GENERATOR="Visual Studio 12 2013 Win64"
echo "Using VS 2013..."
) else if %VS_VERSION% == 2022 (
set GENERATOR="Visual Studio 17 2022"
echo "Using VS 2022..."
)

cd %SRC%
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,4 @@
set SCRIPT_DIR=%~dp0

:: Call with correct parameter
call %SCRIPT_DIR%\..\scripts\windows\build.bat RelWithDebInfo 2019

call %SCRIPT_DIR%\..\scripts\windows\build.bat RelWithDebInfo 2022
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

build_file: "clspv/kokoro/windows-msvc-2019-debug/build.bat"
build_file: "clspv/kokoro/windows-vs2022-amd64-debug/build.bat"
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

build_file: "clspv/kokoro/windows-msvc-2019-debug/build.bat"
build_file: "clspv/kokoro/windows-vs2022-amd64-debug/build.bat"
22 changes: 22 additions & 0 deletions kokoro/windows-vs2022-amd64-release/build.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
:: Copyright 2020 The Clspv Authors. All rights reserved.
::
:: Licensed under the Apache License, Version 2.0 (the "License");
:: you may not use this file except in compliance with the License.
:: You may obtain a copy of the License at
::
:: http://www.apache.org/licenses/LICENSE-2.0
::
:: Unless required by applicable law or agreed to in writing, software
:: distributed under the License is distributed on an "AS IS" BASIS,
:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
:: See the License for the specific language governing permissions and
:: limitations under the License.

@echo on

:: Find out the directory of the common build script.
set SCRIPT_DIR=%~dp0

:: Call with correct parameter
call %SCRIPT_DIR%\..\scripts\windows\build.bat Release 2019

15 changes: 15 additions & 0 deletions kokoro/windows-vs2022-amd64-release/continuous.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright 2020 The Clspv Authors. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

build_file: "clspv/kokoro/windows-msvc-2019-release/build.bat"
15 changes: 15 additions & 0 deletions kokoro/windows-vs2022-amd64-release/presubmit.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright 2020 The Clspv Authors. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

build_file: "clspv/kokoro/windows-msvc-2019-release/build.bat"

0 comments on commit 1e65d18

Please sign in to comment.