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: clarify that MSVC flows are MSVC 2019 #1070

Merged
merged 3 commits into from
Jan 6, 2025
Merged

kokoro: clarify that MSVC flows are MSVC 2019 #1070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d2ad9b
kokoro: clarify that MSVC flows are MSVC 2019
dneto0 Dec 23, 2024
fea0be7
Update paths to 2019
dneto0 Dec 23, 2024
167c7d3
Delete the VS2017 directories
dneto0 Dec 23, 2024
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
7 changes: 5 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 @@ -17,6 +17,7 @@
set BUILD_ROOT=%cd%
set SRC=%cd%\github\amber
set BUILD_TYPE=%1
set VS_VERSION=%2

:: Force usage of python 3.12
set PATH=C:\python312;%PATH%
Expand All @@ -29,8 +30,10 @@ python tools\git-sync-deps
:: #########################################
:: set up msvc build env
:: #########################################
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
echo "Using VS 2019..."
if %VS_VERSION% == 2019 (
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
echo "Using VS 2019..."
)

cmake --version

Expand Down
2 changes: 1 addition & 1 deletion kokoro/windows-msvc-2017-debug/build.bat → kokoro/windows-msvc-2019-debug/build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
:: Find the directory of the common build script.
set SCRIPT_DIR=%~dp0

call %SCRIPT_DIR%\..\scripts\windows\build.bat Debug
call %SCRIPT_DIR%\..\scripts\windows\build.bat Debug 2019
2 changes: 1 addition & 1 deletion ...ro/windows-msvc-2017-debug/continuous.cfg → ...ro/windows-msvc-2019-debug/continuous.cfg
View file
Open in desktop
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: "amber/kokoro/windows-msvc-2017-debug/build.bat"
build_file: "amber/kokoro/windows-msvc-2019-debug/build.bat"
2 changes: 1 addition & 1 deletion kokoro/windows-msvc-2017-debug/presubmit.cfg → kokoro/windows-msvc-2019-debug/presubmit.cfg
View file
Open in desktop
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: "amber/kokoro/windows-msvc-2017-debug/build.bat"
build_file: "amber/kokoro/windows-msvc-2019-debug/build.bat"
3 changes: 2 additions & 1 deletion kokoro/windows-msvc-2017-release/build.bat → kokoro/windows-msvc-2019-release/build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@
:: Find the directory of the common build script.
set SCRIPT_DIR=%~dp0

call %SCRIPT_DIR%\..\scripts\windows\build.bat RelWithDebInfo
call %SCRIPT_DIR%\..\scripts\windows\build.bat RelWithDebInfo 2019

2 changes: 1 addition & 1 deletion .../windows-msvc-2017-release/continuous.cfg → .../windows-msvc-2019-release/continuous.cfg
View file
Open in desktop
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: "amber/kokoro/windows-msvc-2017-release/build.bat"
build_file: "amber/kokoro/windows-msvc-2019-release/build.bat"
2 changes: 1 addition & 1 deletion ...o/windows-msvc-2017-release/presubmit.cfg → ...o/windows-msvc-2019-release/presubmit.cfg
View file
Open in desktop
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: "amber/kokoro/windows-msvc-2017-release/build.bat"
build_file: "amber/kokoro/windows-msvc-2019-release/build.bat"