mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Use bundled libffi on windows-2022
This commit is contained in:
parent
5550c2719a
commit
79a3e89dae
Notes:
git
2021-08-26 19:48:09 +09:00
1 changed files with 2 additions and 10 deletions
8
.github/workflows/windows.yml
vendored
8
.github/workflows/windows.yml
vendored
|
@ -35,11 +35,7 @@ jobs:
|
||||||
)
|
)
|
||||||
- name: Install libraries with vcpkg
|
- name: Install libraries with vcpkg
|
||||||
run: |
|
run: |
|
||||||
IF ${{ matrix.os }}==windows-2019 (
|
|
||||||
vcpkg --triplet x64-windows install readline zlib
|
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
|
||||||
|
@ -66,11 +62,7 @@ jobs:
|
||||||
- name: Configure
|
- name: Configure
|
||||||
run: |
|
run: |
|
||||||
call %VCVARS%
|
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"
|
..\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%
|
||||||
|
|
Loading…
Reference in a new issue