From 7b3cc6dce2164ff0cff6f36b78fbd6ac86ac07c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 19:31:42 +0000 Subject: [PATCH 1/7] Bump jinja2 from 3.0.3 to 3.1.3 in /oqs-template Bumps [jinja2](https://github.com/pallets/jinja) from 3.0.3 to 3.1.3. - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/jinja/compare/3.0.3...3.1.3) --- updated-dependencies: - dependency-name: jinja2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- oqs-template/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oqs-template/requirements.txt b/oqs-template/requirements.txt index 6bd605b4..1cc5566d 100644 --- a/oqs-template/requirements.txt +++ b/oqs-template/requirements.txt @@ -1,4 +1,4 @@ -Jinja2==3.0.3 +Jinja2==3.1.3 MarkupSafe==2.1.3 PyYAML==6.0 tabulate==0.9.0 From d3ff434e656f23aead7481cc5bf65ff9c10ab6b9 Mon Sep 17 00:00:00 2001 From: Michael Baentsch <57787676+baentsch@users.noreply.github.com> Date: Sat, 13 Jan 2024 19:04:20 +0100 Subject: [PATCH 2/7] liboqs doesn't support Windows 2019 MSVC --- .github/workflows/windows.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a699e8cb..04b6e16d 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -96,8 +96,9 @@ jobs: strategy: matrix: os: - - windows-2019 -# - windows-2022 +# liboqs doesn't build under Windows 2019 +# - windows-2019 + - windows-2022 platform: - arch: win64 oqsconfig: -DOQS_ALGS_ENABLED=STD @@ -205,6 +206,7 @@ jobs: strategy: matrix: os: +# liboqs doesn't build under Windows 2019 # - windows-2019 - windows-2022 platform: From 9f764621012f93ee4e6e5b65019728f232168509 Mon Sep 17 00:00:00 2001 From: Michael Baentsch <57787676+baentsch@users.noreply.github.com> Date: Sun, 14 Jan 2024 09:24:57 +0100 Subject: [PATCH 3/7] Force CL for Windows --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 04b6e16d..0cfbbd2b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -150,7 +150,7 @@ jobs: cmake --version mkdir build cd build - cmake -GNinja -DCMAKE_C_FLAGS="/wd5105" -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX="c:\liboqs" ${{ matrix.platform.oqsconfig }} -DOQS_DIST_BUILD=ON .. + CC=cl cmake -GNinja -DCMAKE_C_FLAGS="/wd5105" -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX="c:\liboqs" ${{ matrix.platform.oqsconfig }} -DOQS_DIST_BUILD=ON .. ninja ninja install working-directory: liboqs From 976c34234950d7c91779410d948f676eaccfde5c Mon Sep 17 00:00:00 2001 From: Michael Baentsch <57787676+baentsch@users.noreply.github.com> Date: Sun, 14 Jan 2024 10:04:14 +0100 Subject: [PATCH 4/7] Force CL for Windows --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 0cfbbd2b..a8c8e39b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -150,7 +150,7 @@ jobs: cmake --version mkdir build cd build - CC=cl cmake -GNinja -DCMAKE_C_FLAGS="/wd5105" -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX="c:\liboqs" ${{ matrix.platform.oqsconfig }} -DOQS_DIST_BUILD=ON .. + cmake -GNinja -DCMAKE_C_COMPILER="cl" -DCMAKE_C_FLAGS="/wd5105" -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX="c:\liboqs" ${{ matrix.platform.oqsconfig }} -DOQS_DIST_BUILD=ON .. ninja ninja install working-directory: liboqs From 404c28623258509bd79ea3e3e87494a1ffc525a1 Mon Sep 17 00:00:00 2001 From: Michael Baentsch <57787676+baentsch@users.noreply.github.com> Date: Mon, 15 Jan 2024 08:50:53 +0100 Subject: [PATCH 5/7] fixup MSVC build --- .github/workflows/windows.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a8c8e39b..6c79f651 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -96,8 +96,8 @@ jobs: strategy: matrix: os: -# liboqs doesn't build under Windows 2019 -# - windows-2019 +# liboqs doesn't check Windows 2019 + - windows-2019 - windows-2022 platform: - arch: win64 @@ -189,7 +189,7 @@ jobs: key: ${{ runner.os }}-msvcopenssl32 - name: build oqs-provider run: | - cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="/wd5105" -DOPENSSL_ROOT_DIR="c:\openssl32" -Dliboqs_DIR="c:\liboqs\lib\cmake\liboqs" -S . -B _build + cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER="cl" -DCMAKE_C_FLAGS="/wd5105" -DOPENSSL_ROOT_DIR="c:\openssl32" -Dliboqs_DIR="c:\liboqs\lib\cmake\liboqs" -S . -B _build cd _build ninja - name: Run tests @@ -206,8 +206,8 @@ jobs: strategy: matrix: os: -# liboqs doesn't build under Windows 2019 -# - windows-2019 +# liboqs doesn't check Windows 2019 + - windows-2019 - windows-2022 platform: - arch: win64 From 469e7f9f2af367d97cd3d979ad2166bf914f4268 Mon Sep 17 00:00:00 2001 From: Michael Baentsch <57787676+baentsch@users.noreply.github.com> Date: Mon, 15 Jan 2024 10:28:33 +0100 Subject: [PATCH 6/7] fixup MSVC-native build --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 6c79f651..ff900076 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -296,7 +296,7 @@ jobs: key: ${{ runner.os }}-msvcopenssl32n - name: build oqs-provider run: | - cmake -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_C_FLAGS="/wd5105" -DOPENSSL_ROOT_DIR="c:\openssl32n" -Dliboqs_DIR="c:\liboqs\lib\cmake\liboqs" -S . -B _build + cmake -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_C_COMPILER="cl" -DCMAKE_C_FLAGS="/wd5105" -DOPENSSL_ROOT_DIR="c:\openssl32n" -Dliboqs_DIR="c:\liboqs\lib\cmake\liboqs" -S . -B _build cmake --build _build --config=${{ matrix.type }} - name: Run tests run: | From f094323206a744243bb7bdd743c242298d5784cf Mon Sep 17 00:00:00 2001 From: Michael Baentsch <57787676+baentsch@users.noreply.github.com> Date: Mon, 15 Jan 2024 10:52:39 +0100 Subject: [PATCH 7/7] add MSVC native toolchain --- .CMake/toolchain_windows_amd64.cmake | 12 ++++++++++++ .github/workflows/windows.yml | 3 +-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 .CMake/toolchain_windows_amd64.cmake diff --git a/.CMake/toolchain_windows_amd64.cmake b/.CMake/toolchain_windows_amd64.cmake new file mode 100644 index 00000000..60a0dca9 --- /dev/null +++ b/.CMake/toolchain_windows_amd64.cmake @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: MIT + +set(CMAKE_SYSTEM_NAME Windows) + +set(CMAKE_SYSTEM_PROCESSOR AMD64) + +set(CMAKE_CROSSCOMPILING OFF) + +set(CMAKE_GENERATOR_PLATFORM + x64 + CACHE STRING "Platform" FORCE +) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index ff900076..56a5d1c4 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -206,7 +206,6 @@ jobs: strategy: matrix: os: -# liboqs doesn't check Windows 2019 - windows-2019 - windows-2022 platform: @@ -296,7 +295,7 @@ jobs: key: ${{ runner.os }}-msvcopenssl32n - name: build oqs-provider run: | - cmake -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_C_COMPILER="cl" -DCMAKE_C_FLAGS="/wd5105" -DOPENSSL_ROOT_DIR="c:\openssl32n" -Dliboqs_DIR="c:\liboqs\lib\cmake\liboqs" -S . -B _build + cmake --toolchain ${{ matrix.toolchain }} -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_C_COMPILER="cl" -DCMAKE_C_FLAGS="/wd5105" -DOPENSSL_ROOT_DIR="c:\openssl32n" -Dliboqs_DIR="c:\liboqs\lib\cmake\liboqs" -S . -B _build cmake --build _build --config=${{ matrix.type }} - name: Run tests run: |