Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use vcpkg instead of chocolatey for openssl #7788

Merged
merged 1 commit into from
May 5, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down