From 2367a2cb9033913b68b1230316496ae273c25b54 Mon Sep 17 00:00:00 2001
From: Simon Mo <simon.mo@hey.com>
Date: Thu, 30 Sep 2021 11:58:48 -0700
Subject: [PATCH] Fix windows build environment breakage (#19019)

---
 .bazelrc                   | 8 ++++----
 .github/workflows/main.yml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index f93a09517..161c65148 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -11,12 +11,12 @@ build --compilation_mode=opt
 build:linux --cxxopt="-std=c++17"
 build:macos --cxxopt="-std=c++17"
 build:clang-cl --cxxopt="-std=c++17"
-build:msvc --cxxopt="/std:c++17"
+build:msvc-cl --cxxopt="/std:c++17"
 # This workaround is needed to prevent Bazel from compiling the same file twice (once PIC and once not).
 build:linux --force_pic
 build:macos --force_pic
 build:clang-cl --compiler=clang-cl
-build:msvc --compiler=msvc-cl
+build:msvc-cl --compiler=msvc-cl
 # `LC_ALL` and `LANG` is needed for cpp worker tests, because they will call "ray start".
 # If we don't add them, python's `click` library will raise an error.
 build --action_env=LC_ALL
@@ -35,7 +35,7 @@ build:windows --enable_runfiles
 build:linux    --per_file_copt="-\\.(asm|S)$@-Werror"
 build:macos    --per_file_copt="-\\.(asm|S)$@-Werror"
 build:clang-cl --per_file_copt="-\\.(asm|S)$@-Werror"
-build:msvc     --per_file_copt="-\\.(asm|S)$@-WX"
+build:msvc-cl     --per_file_copt="-\\.(asm|S)$@-WX"
 # Ignore warnings for protobuf generated files and external projects.
 build --per_file_copt="\\.pb\\.cc$@-w"
 build --per_file_copt="-\\.(asm|S)$,external/.*@-w"
@@ -48,7 +48,7 @@ build --per_file_copt="-\\.(asm|S)$,external/com_github_grpc_grpc/.*@-DGRPC_BAZE
 # Don't generate warnings about kernel features we don't need https://github.com/ray-project/ray/issues/6832
 build:linux --per_file_copt="-\\.(asm|S)$,external/com_github_grpc_grpc/.*@-DGPR_MANYLINUX1"
 # Ignore wchar_t -> char conversion warning on MSVC
-build:msvc --per_file_copt="external/boost/libs/regex/src/wc_regex_traits\\.cpp@-wd4244"
+build:msvc-cl --per_file_copt="external/boost/libs/regex/src/wc_regex_traits\\.cpp@-wd4244"
 build --http_timeout_scaling=5.0
 build --verbose_failures
 build:iwyu --experimental_action_listener=//:iwyu_cpp
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1fa461817..9404a4a4d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,7 +26,7 @@ jobs:
             os: windows-2019
             python-version: 3.8
             # Can be 'msvc' or 'clang-cl'
-            config: msvc
+            config: msvc-cl
     env:
       BAZEL_CONFIG: ${{ matrix.config }}
       PYTHON: ${{ matrix.python-version }}