From 8caa377e7659d48ab75bbdfa9a2391c5fc970be8 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 23:38:11 +0800 Subject: [PATCH] v1.18: windows: Use vcpkg for openssl dep (backport of #73) (#86) windows: Use vcpkg for openssl dep (#73) (cherry picked from commit b78c0703ff97d78634c937b04083fd5272595f0c) Co-authored-by: Jon C --- .github/workflows/release-artifacts.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index 45be181c3ce9e1..7aec77f0dac45f 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -43,17 +43,8 @@ jobs: id: build shell: bash run: | - choco install openssl --version=3.1.1 - if [[ -d "C:\Program Files\OpenSSL" ]]; then - echo "OPENSSL_DIR: C:\Program Files\OpenSSL" - export OPENSSL_DIR="C:\Program Files\OpenSSL" - elif [[ -d "C:\Program Files\OpenSSL-Win64" ]]; then - echo "OPENSSL_DIR: C:\Program Files\OpenSSL-Win64" - export OPENSSL_DIR="C:\Program Files\OpenSSL-Win64" - else - echo "can't determine OPENSSL_DIR" - exit 1 - fi + vcpkg install openssl:x64-windows-static-md + vcpkg integrate install choco install protoc export PROTOC="C:\ProgramData\chocolatey\lib\protoc\tools\bin\protoc.exe" source /tmp/env.sh