Skip to content

Commit

Permalink
Add VS2019 kokoro configs (#5059)
Browse files Browse the repository at this point in the history
We added new builds that will test spirv-tools with VS2019, but we need to add
the configurations for them.
  • Loading branch information
s-perron authored Jan 18, 2023
1 parent 4683eab commit 1e85dca
Show file tree
Hide file tree
Showing 8 changed files with 129 additions and 1 deletion.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ headers, and XML registry.

<img alt="Linux" src="kokoro/img/linux.png" width="20px" height="20px" hspace="2px"/>[![Linux Build Status](https://storage.googleapis.com/spirv-tools/badges/build_status_linux_clang_release.svg)](https://storage.googleapis.com/spirv-tools/badges/build_link_linux_clang_release.html)
<img alt="MacOS" src="kokoro/img/macos.png" width="20px" height="20px" hspace="2px"/>[![MacOS Build Status](https://storage.googleapis.com/spirv-tools/badges/build_status_macos_clang_release.svg)](https://storage.googleapis.com/spirv-tools/badges/build_link_macos_clang_release.html)
<img alt="Windows" src="kokoro/img/windows.png" width="20px" height="20px" hspace="2px"/>[![Windows Build Status](https://storage.googleapis.com/spirv-tools/badges/build_status_windows_release.svg)](https://storage.googleapis.com/spirv-tools/badges/build_link_windows_vs2017_release.html)
<img alt="Windows" src="kokoro/img/windows.png" width="20px" height="20px" hspace="2px"/>[![Windows Build Status](https://storage.googleapis.com/spirv-tools/badges/build_status_windows_release.svg)](https://storage.googleapis.com/spirv-tools/badges/build_link_windows_vs2019_release.html)

[More downloads](docs/downloads.md)

Expand Down Expand Up @@ -435,6 +435,8 @@ On MacOS

On Windows
- Visual Studio 2017
- Visual Studio 2019
- Visual Studio 2022

Other compilers or later versions may work, but they are not tested.

Expand Down
3 changes: 3 additions & 0 deletions kokoro/scripts/windows/build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ set PATH=C:\python36;"C:\Program Files\cmake-3.23.1-windows-x86_64\bin";%PATH%
if %VS_VERSION% == 2017 (
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
echo "Using VS 2017..."
) else if %VS_VERSION% == 2019 (
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
echo "Using VS 2019..."
)

cd %SRC%
Expand Down
23 changes: 23 additions & 0 deletions kokoro/windows-msvc-2019-debug/build.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
:: Copyright (c) 2023 Google LLC
::
:: 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.
::
:: Windows Build Script.

@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 Debug 2019
22 changes: 22 additions & 0 deletions kokoro/windows-msvc-2019-debug/continuous.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Copyright (c) 2023 Google LLC
#
# 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.

# Continuous build configuration.
build_file: "SPIRV-Tools/kokoro/windows-msvc-2019-debug/build.bat"

action {
define_artifacts {
regex: "install.zip"
}
}
16 changes: 16 additions & 0 deletions kokoro/windows-msvc-2019-debug/presubmit.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Copyright (c) 2023 Google LLC
#
# 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.

# Presubmit build configuration.
build_file: "SPIRV-Tools/kokoro/windows-msvc-2019-debug/build.bat"
24 changes: 24 additions & 0 deletions kokoro/windows-msvc-2019-release/build.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
:: Copyright (c) 2023 Google LLC
::
:: 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.
::
:: Windows Build Script.

@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 RelWithDebInfo 2019

22 changes: 22 additions & 0 deletions kokoro/windows-msvc-2019-release/continuous.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Copyright (c) 2023 Google LLC.
#
# 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.

# Continuous build configuration.
build_file: "SPIRV-Tools/kokoro/windows-msvc-2019-release/build.bat"

action {
define_artifacts {
regex: "install.zip"
}
}
16 changes: 16 additions & 0 deletions kokoro/windows-msvc-2019-release/presubmit.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Copyright (c) 2023 Google LLC.
#
# 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.

# Presubmit build configuration.
build_file: "SPIRV-Tools/kokoro/windows-msvc-2019-release/build.bat"

0 comments on commit 1e85dca

Please sign in to comment.