Fix for Zephyr CI (#1953)

* Revert to latest Zephyr SDK container * Fix for Zephyr build (missing include for ptrdiff_t) * Zephyr CI tests are now using Zepyhr V3.4 (minimal supported version) and Zephyr V3.7 (current LTS release) Signed-off-by: Tobias Frauenschläger <t.frauenschlaeger@me.com>
open-quantum-safe · Oct 17, 2024 · 81b4452 · 81b4452
1 parent 9aa2e14
commit 81b4452
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml
@@ -9,16 +9,15 @@ jobs:
 
   zephyr_test:
     runs-on: ubuntu-22.04
-    # Note: Revert to *ci:latest once https://github.com/zephyrproject-rtos/docker-image/issues/205 is resolved 
-    container: ghcr.io/zephyrproject-rtos/ci:v0.26.14
+    container: ghcr.io/zephyrproject-rtos/ci:latest
     env:
         CMAKE_PREFIX_PATH: /opt/toolchains
     strategy:
         fail-fast: false
         matrix:
           config:
             - zephyr-ref: v3.4.0
-            - zephyr-ref: v3.5.0
+            - zephyr-ref: v3.7.0
 
     steps:
         - name: Init Zephyr workspace

diff --git a/src/common/common.c b/src/common/common.c
@@ -11,6 +11,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
 
 #if defined(OQS_DIST_BUILD) && defined(OQS_USE_PTHREADS)

diff --git a/zephyr/samples/KEMs/prj.conf b/zephyr/samples/KEMs/prj.conf
@@ -13,6 +13,8 @@ CONFIG_LIBOQS_ENABLE_KEM_KYBER=y
 CONFIG_PICOLIBC=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 
+CONFIG_POSIX_CLOCK=n
+
 # Set the stack size to 512K
 CONFIG_MAIN_STACK_SIZE=524288
 

diff --git a/zephyr/samples/Signatures/prj.conf b/zephyr/samples/Signatures/prj.conf
@@ -8,6 +8,8 @@ CONFIG_LIBOQS_ENABLE_SIG_DILITHIUM=y
 CONFIG_PICOLIBC=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 
+CONFIG_POSIX_CLOCK=n
+
 # Set the stack size to 512K
 CONFIG_MAIN_STACK_SIZE=524288