Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump jinja2 from 3.0.3 to 3.1.3 in /oqs-template #334

Merged
merged 7 commits into from
Jan 16, 2024
Merged

Bump jinja2 from 3.0.3 to 3.1.3 in /oqs-template #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7b3cc6d
Bump jinja2 from 3.0.3 to 3.1.3 in /oqs-template
dependabot[bot] Jan 11, 2024
d3ff434
liboqs doesn't support Windows 2019 MSVC
baentsch Jan 13, 2024
9f76462
Force CL for Windows
baentsch Jan 14, 2024
976c342
Force CL for Windows
baentsch Jan 14, 2024
404c286
fixup MSVC build
baentsch Jan 15, 2024
469e7f9
fixup MSVC-native build
baentsch Jan 15, 2024
f094323
add MSVC native toolchain
baentsch Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .CMake/toolchain_windows_amd64.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
)
11 changes: 6 additions & 5 deletions .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,9 @@ jobs:
strategy:
matrix:
os:
# liboqs doesn't check Windows 2019
- windows-2019
# - windows-2022
- windows-2022
platform:
- arch: win64
oqsconfig: -DOQS_ALGS_ENABLED=STD
Expand Down Expand Up @@ -149,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 ..
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
Expand Down Expand Up @@ -188,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
Expand All @@ -205,7 +206,7 @@ jobs:
strategy:
matrix:
os:
# - windows-2019
- windows-2019
- windows-2022
platform:
- arch: win64
Expand Down Expand Up @@ -294,7 +295,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 --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: |
Expand Down
2 changes: 1 addition & 1 deletion oqs-template/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Jinja2==3.0.3
Jinja2==3.1.3
MarkupSafe==2.1.3
PyYAML==6.0
tabulate==0.9.0
Loading