Merge pull request #1825 from lf-lang/zephyr-bump-version

Update to Zephyr v3.3.0 and SDK v0.16.1
lf-lang · Jun 8, 2023 · 2c3c3c9 · 2c3c3c9
2 parents f4f6f5e + cb554b0
commit 2c3c3c9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/.github/actions/setup-zephyr/action.yml b/.github/actions/setup-zephyr/action.yml
@@ -3,6 +3,11 @@ description: Install Zephyr and dependencies (Linux only)
 runs:
   using: "composite"
   steps:
+    - name: Setup environment variables
+      run: |
+        echo "SDK_VERSION=0.16.1" >> $GITHUB_ENV
+        echo "ZEPHYR_VERSION=3.3.0" >> $GITHUB_ENV
+      shell: bash
     - name: Dependencies
       run: |
         sudo apt-get update && sudo apt-get upgrade
@@ -16,20 +21,20 @@ runs:
       shell: bash
     - name: Install Zephyr SDK
       run : |
-        wget -q https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.15.2/zephyr-sdk-0.15.2_linux-x86_64.tar.gz
-        wget -O - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.15.2/sha256.sum | shasum --check --ignore-missing
-        sudo tar xf zephyr-sdk-0.15.2_linux-x86_64.tar.gz --directory /opt/
-        cd /opt/zephyr-sdk-0.15.2
+        wget -q "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${{env.SDK_VERSION}}/zephyr-sdk-${{env.SDK_VERSION}}_linux-x86_64.tar.xz"
+        wget -O - "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${{env.SDK_VERSION}}/sha256.sum" | shasum --check --ignore-missing
+        sudo tar xvf "zephyr-sdk-${{env.SDK_VERSION}}_linux-x86_64.tar.xz" --directory /opt/
+        cd "/opt/zephyr-sdk-${{env.SDK_VERSION}}"
         sudo ./setup.sh -t all -h -c
       shell: bash
     - name: Download and install Zephyr RTOS
       run: |
           cd $HOME
-          west init zephyrproject --mr v3.2.0
+          west init zephyrproject --mr "v${{env.ZEPHYR_VERSION}}"
           cd zephyrproject
           west update
           west zephyr-export
           pip install -r zephyr/scripts/requirements.txt
           echo "ZEPHYR_BASE=$HOME/zephyrproject/zephyr" >> $GITHUB_ENV
-          echo "ZEPHYR_SDK_INSTALL_DIR=/opt/zephyr-sdk-0.15.2/" >> $GITHUB_ENV
+          echo "ZEPHYR_SDK_INSTALL_DIR=/opt/zephyr-sdk-${{env.SDK_VERSION}}/" >> $GITHUB_ENV
       shell: bash
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -128,8 +128,8 @@ CodeBuilder generateCMakeCode(
         cMakeCode.pr("# Selecting default board");
         cMakeCode.pr("set(BOARD qemu_cortex_m3)");
       }
-      cMakeCode.pr("# We require Zephyr version 3.2.0");
-      cMakeCode.pr("find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} 3.2.0)");
+      cMakeCode.pr("# We recommend Zephyr v3.3.0 but we are compatible with older versions also");
+      cMakeCode.pr("find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} 3.3.0)");
       cMakeCode.newLine();
     }