Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
22 changes: 10 additions & 12 deletions build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -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!"
)
)
)
)
Expand Down
22 changes: 10 additions & 12 deletions share/cpp2b/run_with_msvc_env.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -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!"
)
)
)
)
Expand Down
2 changes: 1 addition & 1 deletion src/main.cpp2
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading