Skip to content

Commit

Permalink
Update CI to use expected OpenSSL versions
Browse files Browse the repository at this point in the history
  • Loading branch information
HoundThe committed Jan 26, 2024
1 parent bee84cd commit 8a03bda
Showing 1 changed file with 22 additions and 12 deletions.
34 changes: 22 additions & 12 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
test-openssl1-1:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os: [macos-latest, windows-latest]
# Stops killing other jobs when one fails
fail-fast: false

Expand All @@ -25,19 +25,17 @@ jobs:

- name: Install OpenSSL on MacOS
if: matrix.os == 'macos-latest'
# We want 1.1.1 version max as the 3.0 is default on MacOS otherwise
run: brew install [email protected]

run: |
brew uninstall openssl --ignore-dependencies openssl
brew install [email protected]
- name: Install OpenSSL on Windows
if: matrix.os == 'windows-latest'
run: |
rd -r "C:/Program Files/OpenSSL"
choco install openssl
Copy-Item -Path "C:/Program Files/OpenSSL/lib/VC/x64/MD/*" -Destination "C:/Program Files/OpenSSL/lib/VC" -Recurse
choco install openssl --version=1.1.1.2100
- name: Configure Ubuntu CMake
if: matrix.os == 'ubuntu-latest'
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_TESTS=ON
# Copy-Item -Path "C:/Program Files/OpenSSL/lib/VC/x64/MD/*" -Destination "C:/Program Files/OpenSSL/lib/VC" -Recurse

- name: Configure Windows CMake
if: matrix.os == 'windows-latest'
Expand All @@ -54,17 +52,29 @@ jobs:
working-directory: ${{github.workspace}}/build
run: ctest -C ${{env.BUILD_TYPE}} -VV

test-openssl3-0:
runs-on: macos-latest
test-openssl3:
strategy:
matrix:
os: [macos-latest, ubuntu-latest]
# Stops killing other jobs when one fails
fail-fast: false

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v2

- name: Install OpenSSL on MacOS
if: matrix.os == 'macos-latest'
run: brew install openssl@3

- name: Configure MacOS CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_TESTS=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl
if: matrix.os == 'macos-latest'
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_TESTS=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/[email protected]

- name: Configure Ubuntu CMake
if: matrix.os == 'ubuntu-latest'
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_TESTS=ON

- name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
Expand Down

0 comments on commit 8a03bda

Please sign in to comment.