diff --git a/.circleci/config.yml b/.circleci/config.yml index 1cfbca05..c900afdb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -166,7 +166,7 @@ jobs: - when: condition: not: - equal: [ openssl@3.1, << parameters.OPENSSL_PREINSTALL >> ] + equal: [ openssl@3, << parameters.OPENSSL_PREINSTALL >> ] steps: - run: name: Clone and build OpenSSL(3) master @@ -186,7 +186,7 @@ jobs: fi - when: condition: - equal: [ openssl@3.1, << parameters.OPENSSL_PREINSTALL >> ] + equal: [ openssl@3, << parameters.OPENSSL_PREINSTALL >> ] steps: - run: name: Build OQS-OpenSSL provider @@ -301,12 +301,12 @@ workflows: - macOS: name: macOS-shared CMAKE_ARGS: -DBUILD_SHARED_LIBS=ON -DOQS_DIST_BUILD=OFF -DOQS_ENABLE_KEM_CLASSIC_MCELIECE=OFF - OPENSSL_PREINSTALL: openssl@3.1 + OPENSSL_PREINSTALL: openssl@3 - macOS: name: macOS-static OQS_PROVIDER_BUILD_STATIC: true CMAKE_ARGS: -DOQS_DIST_BUILD=OFF -DOQS_ENABLE_KEM_CLASSIC_MCELIECE=OFF - OPENSSL_PREINSTALL: openssl@3.1 + OPENSSL_PREINSTALL: openssl@3 on-main-branch: when: or: diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index a0d5edd1..e896a221 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -65,6 +65,7 @@ jobs: ! pip3 install -r oqs-template/requirements.txt 2>&1 | grep ERROR && \ python3 oqs-template/generate.py && \ find . -type f -and '(' -name '*.h' -or -name '*.c' -or -name '*.inc' ')' | xargs clang-format -i && \ + git diff && \ ! git status | grep modified - name: Build .deb install package run: cpack diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 77429b3c..4955fd65 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -101,7 +101,7 @@ jobs: platform: - arch: win64 oqsconfig: -DOQS_ALGS_ENABLED=STD - osslconfig: no-shared no-fips VC-WIN64A-masm + osslconfig: no-shared no-fips VC-WIN64A # - arch: win32 # oqsconfig: -DOQS_ALGS_ENABLED=STD # osslconfig: --strict-warnings no-fips enable-quic