Add MSVC trybot and CI back

Fixes chromium#267
danakj · Nov 25, 2023 · 83a34b0 · 83a34b0
1 parent 7291b7d
commit 83a34b0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 27 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,22 +12,20 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          #- {
-          #    name: "Windows MSVC",
-          #    artifact: "Windows-MSVC.tar.xz",
-          #    # MSVC 17.6.3 can no longer build Subspace. 16 doesn't work either.
-          #    # https://developercommunity.visualstudio.com/t/Update-to-1763-now-rejects-valid-C-i/10394500
-          #    os: windows-latest,
-          #    build_type: "Release",
-          #    cc: "cl",
-          #    cxx: "cl",
-          #    environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
-          #  }
-          #- {
-          #    name: "Windows MinGW", artifact: "Windows-MinGW.tar.xz",
-          #    os: windows-latest,
-          #    build_type: "Release", cc: "gcc", cxx: "g++"
-          #  }
+        - {
+            name: "Windows MSVC",
+            artifact: "Windows-MSVC.tar.xz",
+            os: windows-latest,
+            build_type: "Release",
+            cc: "cl",
+            cxx: "cl",
+            environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
+          }
+        #- {
+        #    name: "Windows MinGW", artifact: "Windows-MinGW.tar.xz",
+        #    os: windows-latest,
+        #    build_type: "Release", cc: "gcc", cxx: "g++"
+        #  }
 
         - {
             name: "Ubuntu Clang-16 Debug",

diff --git a/.github/workflows/try.yml b/.github/workflows/try.yml
@@ -15,17 +15,15 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          #- {
-          #    name: "Windows MSVC",
-          #    artifact: "Windows-MSVC.tar.xz",
-          #    # MSVC 17.6.3 can no longer build Subspace. 16 doesn't work either.
-          #    # https://developercommunity.visualstudio.com/t/Update-to-1763-now-rejects-valid-C-i/10394500
-          #    os: windows-latest,
-          #    build_type: "Release",
-          #    cc: "cl",
-          #    cxx: "cl",
-          #    environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
-          #  }
+          - {
+              name: "Windows MSVC",
+              artifact: "Windows-MSVC.tar.xz",
+              os: windows-latest,
+              build_type: "Release",
+              cc: "cl",
+              cxx: "cl",
+              environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
+            }
           #- {
           #    name: "Windows MinGW", artifact: "Windows-MinGW.tar.xz",
           #    os: windows-latest,