From 9d2ad9bd7029412b8e0d94ce790b66a20e569beb Mon Sep 17 00:00:00 2001 From: David Neto Date: Mon, 23 Dec 2024 16:09:42 -0500 Subject: [PATCH 1/3] kokoro: clarify that MSVC flows are MSVC 2019 They are running MSVC, but the jobs and directories are mislabeled as MSVC 2017. Bug: crbug.com/385757633 (internal) Change-Id: I8bd757e6bc13e4e7f20bb3f4d4dc30236d585361 --- kokoro/windows-msvc-2019-debug/build.bat | 20 +++++++++++++++++++ kokoro/windows-msvc-2019-debug/continuous.cfg | 15 ++++++++++++++ kokoro/windows-msvc-2019-debug/presubmit.cfg | 15 ++++++++++++++ kokoro/windows-msvc-2019-release/build.bat | 20 +++++++++++++++++++ .../windows-msvc-2019-release/continuous.cfg | 15 ++++++++++++++ .../windows-msvc-2019-release/presubmit.cfg | 15 ++++++++++++++ 6 files changed, 100 insertions(+) create mode 100644 kokoro/windows-msvc-2019-debug/build.bat create mode 100644 kokoro/windows-msvc-2019-debug/continuous.cfg create mode 100644 kokoro/windows-msvc-2019-debug/presubmit.cfg create mode 100644 kokoro/windows-msvc-2019-release/build.bat create mode 100644 kokoro/windows-msvc-2019-release/continuous.cfg create mode 100644 kokoro/windows-msvc-2019-release/presubmit.cfg diff --git a/kokoro/windows-msvc-2019-debug/build.bat b/kokoro/windows-msvc-2019-debug/build.bat new file mode 100644 index 000000000..2319b2a6d --- /dev/null +++ b/kokoro/windows-msvc-2019-debug/build.bat @@ -0,0 +1,20 @@ +:: Copyright The Amber Authors. +:: +:: 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 the directory of the common build script. +set SCRIPT_DIR=%~dp0 + +call %SCRIPT_DIR%\..\scripts\windows\build.bat Debug diff --git a/kokoro/windows-msvc-2019-debug/continuous.cfg b/kokoro/windows-msvc-2019-debug/continuous.cfg new file mode 100644 index 000000000..abb0eb288 --- /dev/null +++ b/kokoro/windows-msvc-2019-debug/continuous.cfg @@ -0,0 +1,15 @@ +# Copyright The Amber Authors. +# +# 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: "amber/kokoro/windows-msvc-2017-debug/build.bat" diff --git a/kokoro/windows-msvc-2019-debug/presubmit.cfg b/kokoro/windows-msvc-2019-debug/presubmit.cfg new file mode 100644 index 000000000..abb0eb288 --- /dev/null +++ b/kokoro/windows-msvc-2019-debug/presubmit.cfg @@ -0,0 +1,15 @@ +# Copyright The Amber Authors. +# +# 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: "amber/kokoro/windows-msvc-2017-debug/build.bat" diff --git a/kokoro/windows-msvc-2019-release/build.bat b/kokoro/windows-msvc-2019-release/build.bat new file mode 100644 index 000000000..82d353cbe --- /dev/null +++ b/kokoro/windows-msvc-2019-release/build.bat @@ -0,0 +1,20 @@ +:: Copyright The Amber Authors. +:: +:: 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 the directory of the common build script. +set SCRIPT_DIR=%~dp0 + +call %SCRIPT_DIR%\..\scripts\windows\build.bat RelWithDebInfo diff --git a/kokoro/windows-msvc-2019-release/continuous.cfg b/kokoro/windows-msvc-2019-release/continuous.cfg new file mode 100644 index 000000000..4830e5404 --- /dev/null +++ b/kokoro/windows-msvc-2019-release/continuous.cfg @@ -0,0 +1,15 @@ +# Copyright The Amber Authors. +# +# 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: "amber/kokoro/windows-msvc-2017-release/build.bat" diff --git a/kokoro/windows-msvc-2019-release/presubmit.cfg b/kokoro/windows-msvc-2019-release/presubmit.cfg new file mode 100644 index 000000000..4830e5404 --- /dev/null +++ b/kokoro/windows-msvc-2019-release/presubmit.cfg @@ -0,0 +1,15 @@ +# Copyright The Amber Authors. +# +# 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: "amber/kokoro/windows-msvc-2017-release/build.bat" From fea0be738adc606e66d0d2f9c5f61ab9189c817e Mon Sep 17 00:00:00 2001 From: David Neto Date: Mon, 23 Dec 2024 16:30:54 -0500 Subject: [PATCH 2/3] Update paths to 2019 Change-Id: If24a688c7c565a03e3015722ee8fa110c208b907 --- kokoro/windows-msvc-2019-debug/continuous.cfg | 2 +- kokoro/windows-msvc-2019-debug/presubmit.cfg | 2 +- kokoro/windows-msvc-2019-release/continuous.cfg | 2 +- kokoro/windows-msvc-2019-release/presubmit.cfg | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kokoro/windows-msvc-2019-debug/continuous.cfg b/kokoro/windows-msvc-2019-debug/continuous.cfg index abb0eb288..f8cb2fab5 100644 --- a/kokoro/windows-msvc-2019-debug/continuous.cfg +++ b/kokoro/windows-msvc-2019-debug/continuous.cfg @@ -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" diff --git a/kokoro/windows-msvc-2019-debug/presubmit.cfg b/kokoro/windows-msvc-2019-debug/presubmit.cfg index abb0eb288..f8cb2fab5 100644 --- a/kokoro/windows-msvc-2019-debug/presubmit.cfg +++ b/kokoro/windows-msvc-2019-debug/presubmit.cfg @@ -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" diff --git a/kokoro/windows-msvc-2019-release/continuous.cfg b/kokoro/windows-msvc-2019-release/continuous.cfg index 4830e5404..0de8e5f7c 100644 --- a/kokoro/windows-msvc-2019-release/continuous.cfg +++ b/kokoro/windows-msvc-2019-release/continuous.cfg @@ -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" diff --git a/kokoro/windows-msvc-2019-release/presubmit.cfg b/kokoro/windows-msvc-2019-release/presubmit.cfg index 4830e5404..0de8e5f7c 100644 --- a/kokoro/windows-msvc-2019-release/presubmit.cfg +++ b/kokoro/windows-msvc-2019-release/presubmit.cfg @@ -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" From 167c7d3d928d543e74672173efa9b4710e9ffb2d Mon Sep 17 00:00:00 2001 From: David Neto Date: Mon, 23 Dec 2024 16:36:12 -0500 Subject: [PATCH 3/3] Delete the VS2017 directories Pass the visual studio version to the windows build script Change-Id: I1cf21ed387a52f4a260211be9964d84dc446d2f4 --- kokoro/scripts/windows/build.bat | 7 +++++-- kokoro/windows-msvc-2017-debug/build.bat | 20 ------------------- kokoro/windows-msvc-2017-debug/continuous.cfg | 15 -------------- kokoro/windows-msvc-2017-debug/presubmit.cfg | 15 -------------- kokoro/windows-msvc-2017-release/build.bat | 20 ------------------- .../windows-msvc-2017-release/continuous.cfg | 15 -------------- .../windows-msvc-2017-release/presubmit.cfg | 15 -------------- kokoro/windows-msvc-2019-debug/build.bat | 2 +- kokoro/windows-msvc-2019-release/build.bat | 3 ++- 9 files changed, 8 insertions(+), 104 deletions(-) delete mode 100644 kokoro/windows-msvc-2017-debug/build.bat delete mode 100644 kokoro/windows-msvc-2017-debug/continuous.cfg delete mode 100644 kokoro/windows-msvc-2017-debug/presubmit.cfg delete mode 100644 kokoro/windows-msvc-2017-release/build.bat delete mode 100644 kokoro/windows-msvc-2017-release/continuous.cfg delete mode 100644 kokoro/windows-msvc-2017-release/presubmit.cfg diff --git a/kokoro/scripts/windows/build.bat b/kokoro/scripts/windows/build.bat index 807094e24..3b659764a 100644 --- a/kokoro/scripts/windows/build.bat +++ b/kokoro/scripts/windows/build.bat @@ -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% @@ -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 diff --git a/kokoro/windows-msvc-2017-debug/build.bat b/kokoro/windows-msvc-2017-debug/build.bat deleted file mode 100644 index 2319b2a6d..000000000 --- a/kokoro/windows-msvc-2017-debug/build.bat +++ /dev/null @@ -1,20 +0,0 @@ -:: Copyright The Amber Authors. -:: -:: 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 the directory of the common build script. -set SCRIPT_DIR=%~dp0 - -call %SCRIPT_DIR%\..\scripts\windows\build.bat Debug diff --git a/kokoro/windows-msvc-2017-debug/continuous.cfg b/kokoro/windows-msvc-2017-debug/continuous.cfg deleted file mode 100644 index abb0eb288..000000000 --- a/kokoro/windows-msvc-2017-debug/continuous.cfg +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright The Amber Authors. -# -# 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: "amber/kokoro/windows-msvc-2017-debug/build.bat" diff --git a/kokoro/windows-msvc-2017-debug/presubmit.cfg b/kokoro/windows-msvc-2017-debug/presubmit.cfg deleted file mode 100644 index abb0eb288..000000000 --- a/kokoro/windows-msvc-2017-debug/presubmit.cfg +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright The Amber Authors. -# -# 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: "amber/kokoro/windows-msvc-2017-debug/build.bat" diff --git a/kokoro/windows-msvc-2017-release/build.bat b/kokoro/windows-msvc-2017-release/build.bat deleted file mode 100644 index 82d353cbe..000000000 --- a/kokoro/windows-msvc-2017-release/build.bat +++ /dev/null @@ -1,20 +0,0 @@ -:: Copyright The Amber Authors. -:: -:: 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 the directory of the common build script. -set SCRIPT_DIR=%~dp0 - -call %SCRIPT_DIR%\..\scripts\windows\build.bat RelWithDebInfo diff --git a/kokoro/windows-msvc-2017-release/continuous.cfg b/kokoro/windows-msvc-2017-release/continuous.cfg deleted file mode 100644 index 4830e5404..000000000 --- a/kokoro/windows-msvc-2017-release/continuous.cfg +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright The Amber Authors. -# -# 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: "amber/kokoro/windows-msvc-2017-release/build.bat" diff --git a/kokoro/windows-msvc-2017-release/presubmit.cfg b/kokoro/windows-msvc-2017-release/presubmit.cfg deleted file mode 100644 index 4830e5404..000000000 --- a/kokoro/windows-msvc-2017-release/presubmit.cfg +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright The Amber Authors. -# -# 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: "amber/kokoro/windows-msvc-2017-release/build.bat" diff --git a/kokoro/windows-msvc-2019-debug/build.bat b/kokoro/windows-msvc-2019-debug/build.bat index 2319b2a6d..2611fd433 100644 --- a/kokoro/windows-msvc-2019-debug/build.bat +++ b/kokoro/windows-msvc-2019-debug/build.bat @@ -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 diff --git a/kokoro/windows-msvc-2019-release/build.bat b/kokoro/windows-msvc-2019-release/build.bat index 82d353cbe..6a6aa0594 100644 --- a/kokoro/windows-msvc-2019-release/build.bat +++ b/kokoro/windows-msvc-2019-release/build.bat @@ -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 +