Skip to content

Commit

Permalink
Refs #19490: Look for OpenSSL directory in several places
Browse files Browse the repository at this point in the history
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
  • Loading branch information
EduPonz committed Sep 28, 2023
1 parent d90c2c6 commit cc4ba58
Showing 1 changed file with 24 additions and 8 deletions.
32 changes: 24 additions & 8 deletions .github/workflows/reusable-windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down

0 comments on commit cc4ba58

Please sign in to comment.