From 6ca91161d57b0e13a7a492d712a15738b5959200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Svensson?= Date: Fri, 29 Nov 2024 13:20:31 +0100 Subject: [PATCH] Correcting build options for Windows in CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The CI installed libraries botan and openssl (x86 only) lacks support for ECC and EDDSA, which now are disabled during the CI builds. Windows x64 with OpenSSL still builds and runs these tests. Signed-off-by: Björn Svensson --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32fbd27e..d8018117 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,12 +67,15 @@ jobs: - arch: x64 backend: openssl target-platform: x64 + build-options: - arch: x64 backend: botan target-platform: x64 + build-options: -DENABLE_ECC=OFF -DENABLE_EDDSA=OFF - arch: x86 backend: openssl target-platform: Win32 + build-options: -DENABLE_ECC=OFF -DENABLE_EDDSA=OFF steps: - uses: actions/checkout@v4 - uses: ilammy/msvc-dev-cmd@v1 @@ -93,7 +96,7 @@ jobs: - name: Build run: | mkdir build - cmake -B build ${{ steps.vcpkg.outputs.vcpkg-cmake-config }} -A ${{ matrix.target-platform }} -DWITH_CRYPTO_BACKEND=${{ matrix.backend }} -DDISABLE_NON_PAGED_MEMORY=ON -DBUILD_TESTS=ON + cmake -B build ${{ steps.vcpkg.outputs.vcpkg-cmake-config }} -A ${{ matrix.target-platform }} -DWITH_CRYPTO_BACKEND=${{ matrix.backend }} ${{ matrix.build-options }} -DDISABLE_NON_PAGED_MEMORY=ON -DBUILD_TESTS=ON cmake --build build - name: Test env: