summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNARUSE, Yui <nurse@users.noreply.github.com>2023-05-05 23:07:23 +0900
committerGitHub <noreply@github.com>2023-05-05 14:07:23 +0000
commit664433fe61d0c80d04e8db30709af44af3266597 (patch)
treeb67ac606feea48934e7763a003a52c5237bd1899
parent957bb7cb81995f26c671afce0ee50a5c660e540e (diff)
Use vcpkg instead of chocolatey for openssl (#7788)
-rw-r--r--.github/workflows/windows.yml4
1 files changed, 1 insertions, 3 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 0dcc3cd8e7..91ef04a0f8 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -57,7 +57,7 @@ jobs:
${{ runner.os }}-vcpkg-download-
- name: Install libraries with vcpkg
run: |
- vcpkg --triplet x64-windows install readline zlib
+ vcpkg --triplet x64-windows install openssl readline zlib
- uses: actions/cache@v3
with:
path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
@@ -69,7 +69,6 @@ jobs:
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
@@ -102,7 +101,6 @@ jobs:
../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"
- run: nmake incs
- run: nmake extract-extlibs
- run: nmake