From 83a34b05f1319835a124e3e049bf87f07997764c Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sat, 25 Nov 2023 16:25:49 -0500 Subject: [PATCH] Add MSVC trybot and CI back Fixes #267 --- .github/workflows/ci.yml | 30 ++++++++++++++---------------- .github/workflows/try.yml | 20 +++++++++----------- 2 files changed, 23 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fd07be9a9..1cbf5ff32 100644 --- 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 index ccd2ccf38..f5a0bdc74 100644 --- 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,