diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 935b9e19..10d39a21 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: Build Mob on: push: - branches: master + branches: [master] pull_request: types: [opened, synchronize, reopened] diff --git a/bootstrap.ps1 b/bootstrap.ps1 index f4d6e1b1..2f824069 100644 --- a/bootstrap.ps1 +++ b/bootstrap.ps1 @@ -13,7 +13,7 @@ if (!$root) { $output = if ($Verbose) { "Out-Default" } else { "Out-Null" } -cmake -B $root/build -G "Visual Studio 17 2022" $root | & $output +cmake -B $root/build -G "Visual Studio 18 2026" $root | & $output $installationPath = & $root\third-party\bin\vswhere.exe -products * -nologo -prerelease -latest -property installationPath if (! $?) { @@ -27,7 +27,7 @@ if (! $installationPath) { } $opts = "" -$opts += " $root\build\mob.sln" +$opts += " $root\build\mob.slnx" $opts += " -m" $opts += " -p:Configuration=${Config}" $opts += " -noLogo"