From 4f8c9e2c672340c0f0d13421c8ae95f6a1557c2d Mon Sep 17 00:00:00 2001 From: Spencer Wilson Date: Fri, 9 Aug 2024 13:14:47 -0400 Subject: [PATCH] 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 --- .github/workflows/unix.yml | 14 ++++++++------ CMakeLists.txt | 2 -- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/unix.yml b/.github/workflows/unix.yml index 9bac98d3b4..c55dd86ee7 100644 --- a/.github/workflows/unix.yml +++ b/.github/workflows/unix.yml @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index ebbd58962f..99f431413e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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)