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

ruby-changes:67259

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

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

From 79a3e89dae060df9086668118359627f9df373d7 Mon Sep 17 00:00:00 2001
From: Kazuhiro NISHIYAMA <zn@m...>
Date: Thu, 26 Aug 2021 14:05:34 +0900
Subject: Use bundled libffi on windows-2022

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

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index a9c73b7..5c82e1f 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -35,11 +35,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/windows.yml#L35
           )
       - 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: https://github.com/ruby/ruby/blob/trunk/.github/workflows/windows.yml#L62
       - 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%
-- 
cgit v1.1


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

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