From fe75dc520069283817158965ec64d55b5915a850 Mon Sep 17 00:00:00 2001 From: Ezekiel Warren Date: Fri, 8 May 2026 10:59:26 -0700 Subject: [PATCH 1/2] chore: remove msvc compiler version limit --- build.cmd | 22 ++++++++++------------ share/cpp2b/run_with_msvc_env.cmd | 22 ++++++++++------------ src/main.cpp2 | 2 +- 3 files changed, 21 insertions(+), 25 deletions(-) diff --git a/build.cmd b/build.cmd index 5163bbd..c4339e4 100644 --- a/build.cmd +++ b/build.cmd @@ -192,21 +192,19 @@ for /f "tokens=1-3 delims=." %%a in ("!ver!") do ( if "%major%"=="14" ( set /a m=!minor! set /a p=!patch! - if !m! LEQ 43 ( - if not defined chosen_version ( + if not defined chosen_version ( + set "chosen_version=!ver!" + set "chosen_minor=!m!" + set "chosen_patch=!p!" + ) else ( + if !m! GTR !chosen_minor! ( + set "chosen_version=!ver!" + set "chosen_minor=!m!" + set "chosen_patch=!p!" + ) else if !m! EQU !chosen_minor! if !p! GTR !chosen_patch! ( set "chosen_version=!ver!" set "chosen_minor=!m!" set "chosen_patch=!p!" - ) else ( - if !m! GTR !chosen_minor! ( - set "chosen_version=!ver!" - set "chosen_minor=!m!" - set "chosen_patch=!p!" - ) else if !m! EQU !chosen_minor! if !p! GTR !chosen_patch! ( - set "chosen_version=!ver!" - set "chosen_minor=!m!" - set "chosen_patch=!p!" - ) ) ) ) diff --git a/share/cpp2b/run_with_msvc_env.cmd b/share/cpp2b/run_with_msvc_env.cmd index e1df8f6..49dfd84 100644 --- a/share/cpp2b/run_with_msvc_env.cmd +++ b/share/cpp2b/run_with_msvc_env.cmd @@ -46,21 +46,19 @@ for /f "tokens=1-3 delims=." %%a in ("!ver!") do ( if "%major%"=="14" ( set /a m=!minor! set /a p=!patch! - if !m! LEQ 43 ( - if not defined ChosenMSVC ( + if not defined ChosenMSVC ( + set "ChosenMSVC=!ver!" + set "chosen_minor=!m!" + set "chosen_patch=!p!" + ) else ( + if !m! GTR !chosen_minor! ( + set "ChosenMSVC=!ver!" + set "chosen_minor=!m!" + set "chosen_patch=!p!" + ) else if !m! EQU !chosen_minor! if !p! GTR !chosen_patch! ( set "ChosenMSVC=!ver!" set "chosen_minor=!m!" set "chosen_patch=!p!" - ) else ( - if !m! GTR !chosen_minor! ( - set "ChosenMSVC=!ver!" - set "chosen_minor=!m!" - set "chosen_patch=!p!" - ) else if !m! EQU !chosen_minor! if !p! GTR !chosen_patch! ( - set "ChosenMSVC=!ver!" - set "chosen_minor=!m!" - set "chosen_patch=!p!" - ) ) ) ) diff --git a/src/main.cpp2 b/src/main.cpp2 index 0f68662..0f8b718 100644 --- a/src/main.cpp2 +++ b/src/main.cpp2 @@ -466,7 +466,7 @@ main: (args) -> int = { major_version := vc_tools_version.substr(0, after_major_index).std::stoi(); minor_version := vc_tools_version.substr(after_major_index + 1, after_minor_index - after_major_index - 1).std::stoi(); - if major_version == 14 && minor_version >= 44 { + if major_version == 14 && minor_version >= 55 { log_error("vs tools version {} is unsupported", vc_tools_version); log_error("please install vs tools 14.42 or 14.43"); std::exit(1); From ea192f616517ea2d6f97939ca2fb93b357c422b7 Mon Sep 17 00:00:00 2001 From: Ezekiel Warren Date: Fri, 8 May 2026 11:03:42 -0700 Subject: [PATCH 2/2] chore: use new windows runner --- .github/workflows/main.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 8b997e1..bef6d66 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -22,7 +22,7 @@ jobs: build-script-windows: name: 'build.cmd' - runs-on: windows-2025 + runs-on: windows-2025-vs2026 steps: - uses: actions/checkout@v4 - run: .\build.cmd @@ -36,7 +36,7 @@ jobs: build-self-windows: name: 'build self (windows)' needs: build-script-windows - runs-on: windows-2025 + runs-on: windows-2025-vs2026 steps: - uses: actions/checkout@v4 - uses: actions/download-artifact@v4