From f772e4e605baaf9ffe62cd13a96badd48a8e8bad Mon Sep 17 00:00:00 2001 From: Mike McMahon Date: Sat, 28 Mar 2026 08:46:49 -0700 Subject: [PATCH 1/2] Upgrade to a more recent version of Zephyr. This shows some new incompatibilities. --- .github/workflows/build-zephyr.yml | 4 ++-- nrfx-blink-sdk/west.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-zephyr.yml b/.github/workflows/build-zephyr.yml index fa03f43f..b3a0177d 100644 --- a/.github/workflows/build-zephyr.yml +++ b/.github/workflows/build-zephyr.yml @@ -27,14 +27,14 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: 3.11 + python-version: 3.12 - name: Setup Zephyr project uses: zephyrproject-rtos/action-zephyr-setup@v1 with: app-path: ${{ matrix.example }} toolchains: arm-zephyr-eabi - sdk-version: 0.17.0 + sdk-version: 0.17.4 - name: Install Swift uses: ./.github/actions/install-swift diff --git a/nrfx-blink-sdk/west.yml b/nrfx-blink-sdk/west.yml index ec668bea..f3e3c3f4 100644 --- a/nrfx-blink-sdk/west.yml +++ b/nrfx-blink-sdk/west.yml @@ -6,7 +6,7 @@ manifest: projects: - name: zephyr remote: zephyrproject-rtos - revision: v4.1.0 + revision: v4.2.2 import: name-allowlist: - cmsis # required by the ARM port From c1d9a0a4647d5a8fae9fd205ad766118bee2b054 Mon Sep 17 00:00:00 2001 From: Mike McMahon Date: Sat, 28 Mar 2026 09:59:25 -0700 Subject: [PATCH 2/2] Take import fix from https://github.com/zephyrproject-rtos/example-application/commit/06bbb0a5e5adc5b6da0c0bb16919cebea931ee7e. --- nrfx-blink-sdk/west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nrfx-blink-sdk/west.yml b/nrfx-blink-sdk/west.yml index f3e3c3f4..4642aa4d 100644 --- a/nrfx-blink-sdk/west.yml +++ b/nrfx-blink-sdk/west.yml @@ -9,5 +9,5 @@ manifest: revision: v4.2.2 import: name-allowlist: - - cmsis # required by the ARM port + - cmsis_6 # required by the ARM port for Cortex-M - hal_nordic # required by the custom_plank board (Nordic based)