From 9ee22d9dc52a9d2b38f0de3a5c3b21a36348b252 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Wed, 27 Sep 2023 15:35:37 +0200 Subject: [PATCH] Fix OpenSSL path on Windows CI (#3876) * Refs #19578. Run workflow for currently supported branches. Signed-off-by: Miguel Company * Refs #19578. Fix path to OpenSSL Signed-off-by: Miguel Company --------- Signed-off-by: Miguel Company --- .github/workflows/reusable-windows-ci.yml | 2 +- .github/workflows/windows-ci.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reusable-windows-ci.yml b/.github/workflows/reusable-windows-ci.yml index 730f5c3ab0a..13755d7ed8e 100644 --- a/.github/workflows/reusable-windows-ci.yml +++ b/.github/workflows/reusable-windows-ci.yml @@ -206,7 +206,7 @@ jobs: - name: Update OpenSSL environment variables run: | # Update the environment - "OPENSSL64_ROOT=$Env:ProgramW6432\OpenSSL" | Out-File $Env:GITHUB_ENV -Append -Encoding OEM + "OPENSSL64_ROOT=$Env:ProgramW6432\OpenSSL-Win64" | Out-File $Env:GITHUB_ENV -Append -Encoding OEM - name: Update known hosts file for DNS resolver testing if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') }} diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index c8a0c81cafe..eb2fa7a4b21 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -23,10 +23,9 @@ on: push: branches: - 'master' + - '2.11.x' - '2.10.x' - - '2.9.x' - '2.6.x' - - '2.1.x' paths-ignore: - '**.md' - '**.txt'