Skip to content

Commit

Permalink
correct upstream and Windows CI snafus
Browse files Browse the repository at this point in the history
  • Loading branch information
baentsch committed Dec 24, 2023
1 parent e7971e9 commit 394ee21
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
23 changes: 12 additions & 11 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,18 @@ jobs:
run: cd build/lib && ln -s oqsprovider.so oqsprovider2.so
- name: Test
run: ./scripts/runtests.sh -V
- name: Verify nothing changes on re-generate code
run: |
apt-get update && apt-get install -y clang-format && \
git config --global user.name "ciuser" && \
git config --global user.email "[email protected]" && \
git config --global --add safe.directory `pwd` && \
export LIBOQS_SRC_DIR=`pwd`/liboqs && \
! 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 status | grep modified
# Need to disable due to missing HQC update cherry-pick in liboqs release:
# - name: Verify nothing changes on re-generate code
# run: |
# apt-get update && apt-get install -y clang-format && \
# git config --global user.name "ciuser" && \
# git config --global user.email "[email protected]" && \
# git config --global --add safe.directory `pwd` && \
# export LIBOQS_SRC_DIR=`pwd`/liboqs && \
# ! 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 status | grep modified
- name: Build .deb install package
run: cpack
working-directory: build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ jobs:
working-directory: liboqs
- name: prepare the OpenSSL build directory
if: steps.cache-openssl32.outputs.cache-hit != 'true'
run: mkdir build
run: mkdir _build
working-directory: openssl
- name: OpenSSL config
if: steps.cache-openssl32.outputs.cache-hit != 'true'
Expand Down Expand Up @@ -265,7 +265,7 @@ jobs:
working-directory: liboqs
- name: prepare the OpenSSL build directory
if: steps.cache-openssl32n.outputs.cache-hit != 'true'
run: mkdir build
run: mkdir _build
working-directory: openssl
- name: OpenSSL config
if: steps.cache-openssl32n.outputs.cache-hit != 'true'
Expand Down

0 comments on commit 394ee21

Please sign in to comment.