From cc4ba58c9e2f7591d9c5a865b2b815b4b95354ed Mon Sep 17 00:00:00 2001 From: EduPonz Date: Thu, 28 Sep 2023 11:04:59 +0200 Subject: [PATCH] Refs #19490: Look for OpenSSL directory in several places Signed-off-by: EduPonz --- .github/workflows/reusable-windows-ci.yml | 32 +++++++++++++++++------ 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/.github/workflows/reusable-windows-ci.yml b/.github/workflows/reusable-windows-ci.yml index 4bd1022b5cd..67b2f8c2de6 100644 --- a/.github/workflows/reusable-windows-ci.yml +++ b/.github/workflows/reusable-windows-ci.yml @@ -139,6 +139,30 @@ jobs: # WER service is manual by default Start-Service WerSvc + - name: Install OpenSSL + uses: eProsima/eprosima-CI/windows/install_openssl@v0 + + - name: Update OpenSSL environment variables + run: | + # Update the environment + if (Test-Path -Path $Env:ProgramW6432\OpenSSL) + { + "OPENSSL64_ROOT=$Env:ProgramW6432\OpenSSL" | Out-File $Env:GITHUB_ENV -Append -Encoding OEM + } + elseif (Test-Path -Path $Env:ProgramW6432\OpenSSL-Win) + { + "OPENSSL64_ROOT=$Env:ProgramW6432\OpenSSL-Win" | Out-File $Env:GITHUB_ENV -Append -Encoding OEM + } + elseif (Test-Path -Path $Env:ProgramW6432\OpenSSL-Win64) + { + "OPENSSL64_ROOT=$Env:ProgramW6432\OpenSSL-Win64" | Out-File $Env:GITHUB_ENV -Append -Encoding OEM + } + else + { + Write-Error -Message "Cannot find OpenSSL installation." + exit 1 + } + - name: Install colcon and other python packages run: | pip3 install -U colcon-common-extensions vcstool colcon-mixin xmlschema @@ -204,14 +228,6 @@ jobs: # clean up 'build', 'googletest', 'gtest.log' | del -Recurse -Force - - name: Install OpenSSL - uses: eProsima/eprosima-CI/windows/install_openssl@v0 - - - name: Update OpenSSL environment variables - run: | - # Update the environment - "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') }} run: |