cleanup

Author: scotthart

ci/kokoro/lib/vcpkg.sh

@@ -32,10 +32,11 @@ install_vcpkg() {
   io::log "Downloading vcpkg into ${vcpkg_dir}..."
   VCPKG_VERSION="$(<ci/etc/vcpkg-version.txt)"
   url="https://github.com/microsoft/vcpkg/archive/${VCPKG_VERSION}.tar.gz"
-#  if [[ "${VCPKG_VERSION}" =~ [0-9]{4}.[0-9]{2}.[0-9]{2} ]]; then
-#    # vcpkg uses date-like tags for releases
-#    url="https://github.com/microsoft/vcpkg/archive/refs/tags/${VCPKG_VERSION}.tar.gz"
-#  fi
+  # TODO(#15942): Figure out why this check isn't working.
+  #  if [[ "${VCPKG_VERSION}" =~ [0-9]{4}.[0-9]{2}.[0-9]{2} ]]; then
+  #    # vcpkg uses date-like tags for releases
+  #    url="https://github.com/microsoft/vcpkg/archive/refs/tags/${VCPKG_VERSION}.tar.gz"
+  #  fi
   ci/retry-command.sh 3 120 curl -fsSL "${url}" |
     tar -C "${vcpkg_dir}" --strip-components=1 -zxf -
 

ci/kokoro/windows/build.bat

@@ -21,7 +21,6 @@ REM Configure the environment to use MSVC %MSVC_VERSION% and then switch to Powe
 call "%ProgramFiles(x86)%\Microsoft Visual Studio\%MSVC_VERSION%\BuildTools\VC\Auxiliary\Build\vcvars64.bat"
 set "BAZEL_VC=%ProgramFiles(x86)%\Microsoft Visual Studio\%MSVC_VERSION%\BuildTools\VC"
 set "VCPKG_OVERLAY_TRIPLETS=%cd%\ci\kokoro\windows\triplets"
-@REM set "VCPKG_OVERLAY_PORTS=%cd%\ci\kokoro\windows\vcpkg-overlays"
 
 REM The remaining of the build script is implemented in PowerShell.
 @echo %date% %time%

ci/kokoro/windows/lib/vcpkg.ps1

@@ -69,6 +69,7 @@ function Install-Vcpkg {
 
     $vcpkg_version = Get-Content -Path "${project_root}\ci\etc\vcpkg-version.txt"
     $vcpkg_url = "https://github.com/microsoft/vcpkg/archive/${vcpkg_version}.zip"
+#     TODO(#15942): Figure out why this check isn't working.
 #     if ($vcpkg_version -match "[0-9]{4}.[0-9]{2}.[0-9]{2}" ) {
 #         $vcpkg_url = "https://github.com/microsoft/vcpkg/archive/refs/tags/${vcpkg_version}.zip"
 #     }