Use newer libffi on windows-2022

This commit is contained in:
Kazuhiro NISHIYAMA 2021-08-25 15:57:02 +09:00 committed by Kazuhiro NISHIYAMA
parent b1f58d3e91
commit d96ba8c5c3
Notes: git 2021-08-26 19:48:10 +09:00

View file

@ -30,7 +30,11 @@ jobs:
) )
- name: Install libraries with vcpkg - name: Install libraries with vcpkg
run: | run: |
vcpkg --triplet x64-windows install readline zlib IF ${{ matrix.os }}==windows-2019 (
vcpkg --triplet x64-windows install readline zlib
) ELSE (
vcpkg --triplet x64-windows install readline zlib libffi
)
- uses: actions/cache@v2 - uses: actions/cache@v2
with: with:
path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
@ -57,7 +61,11 @@ jobs:
- name: Configure - name: Configure
run: | run: |
call %VCVARS% call %VCVARS%
../src/win32/configure.bat --disable-install-doc --enable-bundled-libffi --with-opt-dir=C:/vcpkg/installed/x64-windows --with-openssl-dir="C:/Program Files/OpenSSL-Win64" IF ${{ matrix.os }}==windows-2019 (
..\src\win32\configure.bat --disable-install-doc --enable-bundled-libffi --with-opt-dir=C:/vcpkg/installed/x64-windows --with-openssl-dir="C:/Program Files/OpenSSL-Win64"
) ELSE (
..\src\win32\configure.bat --disable-install-doc --with-opt-dir=C:/vcpkg/installed/x64-windows --with-openssl-dir="C:/Program Files/OpenSSL-Win64"
)
- name: nmake - name: nmake
run: | run: |
call %VCVARS% call %VCVARS%