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

ruby-changes:71178

From: Nobuyoshi <ko1@a...>
Date: Sun, 13 Feb 2022 18:46:05 +0900 (JST)
Subject: [ruby-changes:71178] 7a8ea2e497 (master): [MSWin] Install OpenSSL with vcpkg

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

From 7a8ea2e49720b68323c5cf9899d31c3a9e24dd80 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Sat, 4 Dec 2021 20:06:11 +0900
Subject: [MSWin] Install OpenSSL with vcpkg

---
 .github/workflows/windows.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index cc12157234..63e1c57e95 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -64,7 +64,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/windows.yml#L64
             ${{ runner.os }}-vcpkg-installed-
       - name: Install libraries with vcpkg
         run: |
-          vcpkg --triplet x64-windows install libffi libyaml readline zlib
+          vcpkg --triplet x64-windows install libffi libyaml openssl readline zlib
       - uses: actions/cache@v2
         with:
           path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
@@ -76,7 +76,6 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/windows.yml#L76
         run: |
           # Using Choco-Install for retries, but it doesn't detect failures properly
           # if you pass multiple package names in a single command.
-          Choco-Install -PackageName openssl
           Choco-Install -PackageName winflexbison3
         shell: pwsh
       - name: git config
@@ -109,11 +108,13 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/windows.yml#L108
           for %%I in (C:\vcpkg\installed\x64-windows\bin\*.dll) do (
             if not %%~nI == readline mklink %%~nxI %%I
           )
+          for %%I in (libcrypto-1_1-x64 libssl-1_1-x64) do (
+            ren c:\Windows\System32\%%I.dll %%I.dll_
+          )
       - name: Configure
         run: >-
           ../src/win32/configure.bat --disable-install-doc
           --with-opt-dir=C:/vcpkg/installed/x64-windows
-          --with-openssl-dir="C:/Program Files/OpenSSL-Win64"
       - run: nmake incs
       - run: nmake extract-extlibs
       - run: nmake
-- 
cgit v1.2.1


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

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