Try to make libjade config work

Signed-off-by: Spencer Wilson <[email protected]>
open-quantum-safe · Aug 22, 2024 · cb5ad4e · cb5ad4e
1 parent ab76dce
commit cb5ad4e
Showing 1 changed file with 17 additions and 48 deletions.
diff --git a/.github/workflows/unix.yml b/.github/workflows/unix.yml
@@ -15,7 +15,7 @@ jobs:
 
   stylecheck:
     name: Check code formatting
-    container: openquantumsafe/ci-ubuntu-latest:latest
+    container: openquantumsafe/ci-ubuntu-focal-x86_64:latest
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -24,8 +24,6 @@ jobs:
         run: python3 -m pytest --verbose tests/test_code_conventions.py
       - name: Check that doxygen can parse the documentation
         run: mkdir build && ./scripts/run_doxygen.sh $(which doxygen) ./docs/.Doxyfile ./build
-      - name: Install ajv # TODO move this into Dockerfile
-        run: apt-get update && apt-get install -y npm && npm -g install ajv ajv-cli
       - name: Validate CBOM
         run: scripts/validate_cbom.sh
 
@@ -37,16 +35,9 @@ jobs:
         copy-mode:
           - copy
           - libjade
-    container: openquantumsafe/ci-ubuntu-latest:latest
+    container: openquantumsafe/ci-ubuntu-focal-x86_64:latest
     runs-on: ubuntu-latest
     steps:
-      - name: Install sudo # TODO move this into Dockerfile
-        run: |
-          apt-get update && \
-          apt-get install -y sudo curl \
-          python3-attr python3-git python3-importlib-metadata \
-          python3-markdown-it python3-markupsafe python3-mdit-py-plugins python3-yaml python3-typing-extensions \
-          python3-wget python3-zipp
       - name: Setup nix
         uses: cachix/install-nix-action@v26
       - name: Setup jasmin-compiler
@@ -62,6 +53,7 @@ jobs:
           export LIBOQS_DIR=`pwd` && \
           git config --global --add safe.directory $LIBOQS_DIR && \
           cd scripts/copy_from_upstream && \
+          ! pip3 install --require-hashes -r requirements.txt 2>&1 | grep -i ERROR && \
           python3 copy_from_upstream.py ${{ matrix.copy-mode }} && \
           ! git status | grep modified
 
@@ -70,11 +62,18 @@ jobs:
     needs: [ stylecheck, upstreamcheck ]
     strategy:
       matrix:
+        libjade-build:
+          - -DOQS_LIBJADE_BUILD=OFF
+          # Restrict -DOQS_LIBJADE_BUILD=ON build to algs provided by
+          # libjade to minimise repeated tests
+          - -DOQS_LIBJADE_BUILD=ON -DOQS_MINIMAL_BUILD=$LIBJADE_ALG_LIST
         include:
           - runner: oqs-arm64
             container: openquantumsafe/ci-ubuntu-focal-arm64:latest
           - runner: ubuntu-latest
             container: openquantumsafe/ci-ubuntu-focal-x86_64:latest
+          - runner: ubuntu-latest
+            container: openquantumsafe/ci-ubuntu-jammy:latest
           - runner: ubuntu-latest
             container: openquantumsafe/ci-ubuntu-latest:latest
     runs-on: ${{ matrix.runner }}
@@ -109,6 +108,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        libjade-build:
+          - -DOQS_LIBJADE_BUILD=OFF
+          # Restrict -DOQS_LIBJADE_BUILD=ON build to algs provided by
+          # libjade to minimise repeated tests
+          - -DOQS_LIBJADE_BUILD=ON -DOQS_MINIMAL_BUILD=$LIBJADE_ALG_LIST
         include:
           - name: arm64
             runner: oqs-arm64
@@ -180,41 +184,6 @@ jobs:
             container: openquantumsafe/ci-ubuntu-focal-x86_64:latest
             CMAKE_ARGS: -DCMAKE_C_COMPILER=clang-9 -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DOQS_HAZARDOUS_EXPERIMENTAL_ENABLE_SIG_STFL_KEY_SIG_GEN=OFF -DOQS_ENABLE_SIG_STFL_XMSS=ON -DOQS_ENABLE_SIG_STFL_LMS=ON
             PYTEST_ARGS: --ignore=tests/test_distbuild.py --ignore=tests/test_leaks.py --ignore=tests/test_kat_all.py --maxprocesses=10
-          - name: noble-nistr4-openssl
-            runner: ubuntu-latest
-            container: openquantumsafe/ci-ubuntu-latest:latest
-            CMAKE_ARGS: -DOQS_STRICT_WARNINGS=ON -DOQS_ALGS_ENABLED=NIST_R4
-            PYTEST_ARGS: --ignore=tests/test_leaks.py --ignore=tests/test_kat_all.py
-          - name: noble-nistonramp-openssl
-            runner: ubuntu-latest
-            container: openquantumsafe/ci-ubuntu-latest:latest
-            CMAKE_ARGS: -DOQS_STRICT_WARNINGS=ON -DOQS_ALGS_ENABLED=NIST_SIG_ONRAMP
-            PYTEST_ARGS: --ignore=tests/test_leaks.py --ignore=tests/test_kat_all.py
-          - name: noble-noopenssl
-            runner: ubuntu-latest
-            container: openquantumsafe/ci-ubuntu-latest:latest
-            CMAKE_ARGS: -DCMAKE_C_COMPILER=gcc-8 -DOQS_USE_OPENSSL=OFF
-            PYTEST_ARGS: --ignore=tests/test_leaks.py --ignore=tests/test_kat_all.py
-          - name: noble-shared-noopenssl
-            runner: ubuntu-latest
-            container: openquantumsafe/ci-ubuntu-latest:latest
-            CMAKE_ARGS: -DCMAKE_C_COMPILER=gcc-7 -DOQS_DIST_BUILD=OFF -DOQS_USE_OPENSSL=OFF -DBUILD_SHARED_LIBS=ON
-            PYTEST_ARGS: --ignore=tests/test_namespace.py --ignore=tests/test_leaks.py --ignore=tests/test_kat_all.py
-          - name: noble-clang15
-            runner: ubuntu-latest
-            container: openquantumsafe/ci-ubuntu-latest:latest
-            CMAKE_ARGS: -DOQS_STRICT_WARNINGS=ON -DCMAKE_C_COMPILER=clang-15
-            PYTEST_ARGS: --ignore=tests/test_kat_all.py
-          - name: noble-address-sanitizer
-            runner: ubuntu-latest
-            container: openquantumsafe/ci-ubuntu-latest:latest
-            CMAKE_ARGS: -DCMAKE_C_COMPILER=clang-9 -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DOQS_HAZARDOUS_EXPERIMENTAL_ENABLE_SIG_STFL_KEY_SIG_GEN=ON -DOQS_ENABLE_SIG_STFL_XMSS=ON -DOQS_ENABLE_SIG_STFL_LMS=ON
-            PYTEST_ARGS: --ignore=tests/test_distbuild.py --ignore=tests/test_leaks.py --ignore=tests/test_kat_all.py --maxprocesses=10
-          - name: address-sanitizer-no-stfl-key-sig-gen
-            runner: ubuntu-latest
-            container: openquantumsafe/ci-ubuntu-latest:latest
-            CMAKE_ARGS: -DCMAKE_C_COMPILER=clang-9 -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DOQS_HAZARDOUS_EXPERIMENTAL_ENABLE_SIG_STFL_KEY_SIG_GEN=OFF -DOQS_ENABLE_SIG_STFL_XMSS=ON -DOQS_ENABLE_SIG_STFL_LMS=ON
-            PYTEST_ARGS: --ignore=tests/test_distbuild.py --ignore=tests/test_leaks.py --ignore=tests/test_kat_all.py --maxprocesses=10
     runs-on: ${{ matrix.runner }}
     container:
       image: ${{ matrix.container }}
@@ -295,7 +264,7 @@ jobs:
   linux_cross_compile:
     needs: buildcheck
     runs-on: ubuntu-latest
-    container: openquantumsafe/ci-ubuntu-latest:latest
+    container: openquantumsafe/ci-ubuntu-focal-x86_64:latest
     strategy:
       fail-fast: false
       matrix:
@@ -411,7 +380,7 @@ jobs:
   scan_build:
     needs: buildcheck
     runs-on: ubuntu-latest
-    container: openquantumsafe/ci-ubuntu-latest:latest
+    container: openquantumsafe/ci-ubuntu-focal-x86_64:latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4