Update zephyr-sdk, build ci-base, & include paths

umts · May 15, 2024 · 44e1db4 · 44e1db4
1 parent 0009b32
commit 44e1db4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,9 +15,9 @@ jobs:
     runs-on: ubuntu-latest
     env:
       ZEPHYR_SDK_INSTALL_PATH: /opt/toolchains
-      ZSDK_VERSION: 0.16.5
+      ZSDK_VERSION: 0.16.6
     container:
-      image: ghcr.io/zephyrproject-rtos/ci-base:v0.26.7
+      image: ghcr.io/zephyrproject-rtos/ci-base:v0.26.12
       env:
         ZEPHYR_TOOLCHAIN_VARIANT: zephyr
         ZEPHYR_SDK_INSTALL_DIR: ${ZEPHYR_SDK_INSTALL_PATH}/zephyr-sdk-${ZSDK_VERSION}
@@ -27,6 +27,7 @@ jobs:
       - name: Git checkout
         uses: actions/checkout@v4
 
+      ## The ci-base image now takes care of this, but doesn't allow minimal install ##
       - name: Make ZEPHYR_SDK_INSTALL_PATH
         run: mkdir -p ${ZEPHYR_SDK_INSTALL_PATH}
 

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -3,8 +3,14 @@
     {
       "name": "Linux",
       "includePath": [
-        "${workspaceRoot}/**",
-        "${HOME}.local/zephyr-sdk-0.16.1/arm-zephyr-eabi/arm-zephyr-eabi/include/*"
+        "${workspaceFolder}",
+        "${workspaceFolder}/app/**",
+        "${workspaceFolder}/nrf/include/**",
+        "${workspaceFolder}/modules/hal/nordic/nrfx/nrfx.h",
+        "${workspaceFolder}/zephyr/include/zephyr/**",
+        "${workspaceFolder}/zephyr/include/**",
+        "${workspaceFolder}/zephyr/arch/arm/include/**",
+        "${HOME}.local/zephyr-sdk-0.16.*/arm-zephyr-eabi/arm-zephyr-eabi/include/*"
       ],
       "defines": [],
       "compilerPath": "${workspaceRoot}/.venv/bin/west",