Don't hardcode OPENSSL_ROOT_DIR to /usr on Linux (#1873)

* Don't hardcode OPENSSL_ROOT_DIR to /usr on Linux

* Run buildcheck with latest docker image

---------

Signed-off-by: Spencer Wilson <spencer.wilson@uwaterloo.ca>
This commit is contained in:
Spencer Wilson 2024-08-09 13:14:47 -04:00 committed by GitHub
parent 2acfd964b9
commit 4f8c9e2c67
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions

View File

@ -45,12 +45,14 @@ jobs:
strategy:
matrix:
include:
- arch: arm64
runner: oqs-arm64
- arch: x86_64
runner: ubuntu-latest
- runner: oqs-arm64
container: openquantumsafe/ci-ubuntu-focal-arm64:latest
- runner: ubuntu-latest
container: openquantumsafe/ci-ubuntu-focal-x86_64:latest
- runner: ubuntu-latest
container: openquantumsafe/ci-ubuntu-latest:latest
runs-on: ${{ matrix.runner }}
container: openquantumsafe/ci-ubuntu-focal-${{ matrix.arch }}:latest
container: ${{ matrix.container }}
env:
KEM_NAME: kyber_768
SIG_NAME: dilithium_3
@ -74,7 +76,7 @@ jobs:
- name: Build documentation
run: ninja gen_docs
working-directory: build
if: matrix.arch == 'x86_64'
if: matrix.runner == 'ubuntu-latest'
linux:
needs: buildcheck

View File

@ -128,8 +128,6 @@ if(${OQS_USE_OPENSSL})
elseif(EXISTS "/opt/homebrew/opt/openssl@1.1")
set(OPENSSL_ROOT_DIR "/opt/homebrew/opt/openssl@1.1")
endif()
elseif(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux")
set(OPENSSL_ROOT_DIR "/usr")
endif()
endif()
find_package(OpenSSL 1.1.1 REQUIRED)