krb5 commit: Update Windows CI and installer config
| Newsgroups | gmane.comp.encryption.kerberos.cvs |
|---|---|
| Message-ID | <[email protected]> |
https://github.com/krb5/krb5/commit/649e3372d2505027dafd27b0fe9db573c21c735a commit 649e3372d2505027dafd27b0fe9db573c21c735a Author: Greg Hudson <[email protected]> Date: Tue Feb 22 14:10:13 2022 -0500 Update Windows CI and installer config Add a VCVer case for the new Visual Studio version. Use ilammy/msvc-dev-cmd to set up the build environments. .github/workflows/build.yml | 10 +++++++--- src/windows/installer/wix/config.wxi | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 48c13a598..e7a58485a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,7 +61,7 @@ jobs: fi windows: - runs-on: windows-2019 + runs-on: windows-latest env: KRB_INSTALL_DIR: C:\kfw steps: @@ -71,11 +71,13 @@ jobs: shell: cmd run: | mkdir %KRB_INSTALL_DIR% + - uses: ilammy/msvc-dev-cmd@v1 + with: + arch: x86 - name: Build 32-bit shell: cmd run: | cd src - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars32.bat" set set PATH=%PATH%;%wix%bin nmake -f Makefile.in prep-windows @@ -84,11 +86,13 @@ jobs: cd windows\installer\wix nmake rename kfw.msi kfw32.msi + - uses: ilammy/msvc-dev-cmd@v1 + with: + arch: x64 - name: Build 64-bit shell: cmd run: | cd src - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" set set PATH=%PATH%;%wix%bin;"%WindowsSdkVerBinPath%"\x86 nmake clean diff --git a/src/windows/installer/wix/config.wxi b/src/windows/installer/wix/config.wxi index c789668be..579de4399 100644 --- a/src/windows/installer/wix/config.wxi +++ b/src/windows/installer/wix/config.wxi @@ -51,6 +51,8 @@ <?define VCVer="141"?> <?elseif $(env.VISUALSTUDIOVERSION) = "16.0"?> <?define VCVer="142"?> + <?elseif $(env.VISUALSTUDIOVERSION) = "17.0"?> + <?define VCVer="143"?> <?else?> <?error Unknown MFC version?> <?endif?>