mirror of
https://github.com/open-quantum-safe/liboqs.git
synced 2025-10-04 00:02:01 -04:00
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:
parent
2acfd964b9
commit
4f8c9e2c67
14
.github/workflows/unix.yml
vendored
14
.github/workflows/unix.yml
vendored
@ -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
|
||||
|
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user