From bbd243026a1c98e0ccfc0666783c7106cf02b460 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Sat, 2 Apr 2022 18:02:22 -0400 Subject: [PATCH] Bump the build process to VC++2022. This includes a new B4K built with VC++2022 as well. --- .github/workflows/ci_build.yml | 14 +++++++------- build.ps1 | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml index 97fd186..d45ea8c 100644 --- a/.github/workflows/ci_build.yml +++ b/.github/workflows/ci_build.yml @@ -7,18 +7,18 @@ jobs: matrix: cfg: - { - os: windows-2019, - generator: Visual Studio 16 2019, + os: windows-2022, + generator: Visual Studio 17 2022, arch: Win32, str: windows-x86, - blender-url: "https://github.com/Hoikas/blender2.7/releases/download/blender2.79_20210808/blender-2.79.0-git20210808.d2e1ea3f63e3-windows32.zip", + blender-url: "https://github.com/Hoikas/blender2.7/releases/download/blender2.79_20220402/blender-2.79.0-git20220402.e12c4a607a5e-windows32.zip", } - { - os: windows-2019, - generator: Visual Studio 16 2019, + os: windows-2022, + generator: Visual Studio 17 2022, arch: x64, str: windows-x64, - blender-url: "https://github.com/Hoikas/blender2.7/releases/download/blender2.79_20210808/blender-2.79.0-git20210808.d2e1ea3f63e3-windows64.zip", + blender-url: "https://github.com/Hoikas/blender2.7/releases/download/blender2.79_20220402/blender-2.79.0-git20220402.e12c4a607a5e-windows64.zip", } env: @@ -68,7 +68,7 @@ jobs: publish: if: startsWith(github.ref, 'refs/tags') needs: [windows-build] - runs-on: windows-2019 + runs-on: windows-latest steps: - name: Checkout Korman diff --git a/build.ps1 b/build.ps1 index d068320..b962946 100644 --- a/build.ps1 +++ b/build.ps1 @@ -253,7 +253,7 @@ try { throw "CMake must be installed and available on the PATH." } -$MyGenerator = Find-CMakeArgument $Generator $Env:CMAKE_GENERATOR $Generator_LUT "Visual Studio 16 2019" +$MyGenerator = Find-CMakeArgument $Generator $Env:CMAKE_GENERATOR $Generator_LUT "Visual Studio 17 2022" if ($Classic) { Build-KormanClassicSingleArch "$MyGenerator" x86 "$BuildDir" Build-KormanClassicSingleArch "$MyGenerator" x64 "$BuildDir"