diff options
| author | Greg Hudson <ghudson@mit.edu> | 2022-02-22 14:10:13 -0500 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2022-04-28 18:47:52 -0400 |
| commit | 649e3372d2505027dafd27b0fe9db573c21c735a (patch) | |
| tree | 7a716cd8cd7e2d5f30820e621bdb2164e9ba766f /.github | |
| parent | e8fedd069e6fee046e12920ad2b5a06f1a1567bb (diff) | |
| download | krb5-649e3372d2505027dafd27b0fe9db573c21c735a.zip krb5-649e3372d2505027dafd27b0fe9db573c21c735a.tar.gz krb5-649e3372d2505027dafd27b0fe9db573c21c735a.tar.bz2 | |
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.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build.yml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 48c13a5..e7a5848 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 |