diff options
| author | Kazuhiro NISHIYAMA <zn@mbf.nifty.com> | 2021-08-26 14:05:34 +0900 |
|---|---|---|
| committer | Kazuhiro NISHIYAMA <znz@users.noreply.github.com> | 2021-08-26 19:47:48 +0900 |
| commit | 79a3e89dae060df9086668118359627f9df373d7 (patch) | |
| tree | 2c7c23abe78141aaab828368bdccf8863be7eb06 /.github/workflows | |
| parent | 5550c2719a965a939e508d14354b06713d2f6289 (diff) | |
Use bundled libffi on windows-2022
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4775
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/windows.yml | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a9c73b7769..5c82e1fcc5 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -35,11 +35,7 @@ jobs: ) - name: Install libraries with vcpkg run: | - IF ${{ matrix.os }}==windows-2019 ( - vcpkg --triplet x64-windows install readline zlib - ) ELSE ( - vcpkg --triplet x64-windows install readline zlib libffi - ) + vcpkg --triplet x64-windows install readline zlib - uses: actions/cache@v2 with: path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey @@ -66,11 +62,7 @@ jobs: - name: Configure run: | call %VCVARS% - 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" - ) + ..\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" - name: nmake run: | call %VCVARS% |