[前][次][番号順一覧][スレッド一覧]

ruby-changes:67258

From: Kazuhiro <ko1@a...>
Date: Thu, 26 Aug 2021 19:48:04 +0900 (JST)
Subject: [ruby-changes:67258] d96ba8c5c3 (master): Use newer libffi on windows-2022

https://git.ruby-lang.org/ruby.git/commit/?id=d96ba8c5c3

From d96ba8c5c36bf701dfdec79983102daa7cda6fea Mon Sep 17 00:00:00 2001
From: Kazuhiro NISHIYAMA <zn@m...>
Date: Wed, 25 Aug 2021 15:57:02 +0900
Subject: Use newer libffi on windows-2022

---
 .github/workflows/windows.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index a10c94d..3b95e06 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -30,7 +30,11 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/windows.yml#L30
           )
       - 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: https://github.com/ruby/ruby/blob/trunk/.github/workflows/windows.yml#L61
       - 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%
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]