diff options
| author | Kazuhiro NISHIYAMA <zn@mbf.nifty.com> | 2021-08-25 15:57:02 +0900 |
|---|---|---|
| committer | Kazuhiro NISHIYAMA <znz@users.noreply.github.com> | 2021-08-26 19:47:48 +0900 |
| commit | d96ba8c5c36bf701dfdec79983102daa7cda6fea (patch) | |
| tree | aab78608025cd0b46aae9c7e868c156b6a3abe0c | |
| parent | b1f58d3e91060730e259b293b47e04e889ecf36e (diff) | |
Use newer libffi on windows-2022
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4775
| -rw-r--r-- | .github/workflows/windows.yml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a10c94d100..3b95e0619c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -30,7 +30,11 @@ jobs: ) - name: Install libraries with vcpkg 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 with: path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey @@ -57,7 +61,11 @@ jobs: - name: Configure run: | 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 run: | call %VCVARS% |