From d5ac249b28f903fc4381c8cfed94fef6b991b07b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tja=C5=BE=20Vra=C4=8Dko?= Date: Mon, 30 Jun 2025 14:10:48 +0200 Subject: [PATCH 1/2] fix: gdb (east debug) not working correctly --- ncs-zephyr/Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ncs-zephyr/Dockerfile b/ncs-zephyr/Dockerfile index fe2ed60..c98d5bb 100644 --- a/ncs-zephyr/Dockerfile +++ b/ncs-zephyr/Dockerfile @@ -199,6 +199,12 @@ RUN echo "if [ -f /etc/bash_completion ]; then" >> ~/.bashrc && \ echo " . /etc/bash_completion" >> ~/.bashrc && \ echo "fi" >> ~/.bashrc +# Fix GDB-PY not working +# We tell GDB to ignore $PYTHONPATH and $PYTHONHOME environment variables +# as they are set to point into the nrfutil toolchain. +# We need GDB-PY to use the system python3.10 and the system python libs +# (Python3.10 is the default python version in Ubuntu 22.04). +RUN echo "set python ignore-environment on" > ~/.gdbearlyinit ############# # ZSH image # From 388a2fa237aa50939fe391e45339d7d5d904bb58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tja=C5=BE=20Vra=C4=8Dko?= Date: Mon, 30 Jun 2025 15:07:09 +0200 Subject: [PATCH 2/2] feat: Add NCS v3.0.2 to the list of targets --- .github/workflows/build-and-publish-ncs-zephyr.yaml | 1 + ncs-zephyr/build_ci.sh | 2 +- ncs-zephyr/build_dev.sh | 2 +- ncs-zephyr/build_zsh.sh | 2 +- ncs-zephyr/run.sh | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-publish-ncs-zephyr.yaml b/.github/workflows/build-and-publish-ncs-zephyr.yaml index 8a12415..9405c37 100644 --- a/.github/workflows/build-and-publish-ncs-zephyr.yaml +++ b/.github/workflows/build-and-publish-ncs-zephyr.yaml @@ -34,6 +34,7 @@ jobs: - ncs_version: "v2.9.0" - ncs_version: "v3.0.0" - ncs_version: "v3.0.1" + - ncs_version: "v3.0.2" steps: - name: Checkout repository diff --git a/ncs-zephyr/build_ci.sh b/ncs-zephyr/build_ci.sh index 734dd63..bb0744f 100755 --- a/ncs-zephyr/build_ci.sh +++ b/ncs-zephyr/build_ci.sh @@ -1,5 +1,5 @@ #! /usr/bin/env bash -NCS_SDK_VERSION=v2.7.0 +NCS_SDK_VERSION=v3.0.2 docker build \ --build-arg "NCS_SDK_VERSION=$NCS_SDK_VERSION" \ diff --git a/ncs-zephyr/build_dev.sh b/ncs-zephyr/build_dev.sh index 913d970..d3c55a7 100755 --- a/ncs-zephyr/build_dev.sh +++ b/ncs-zephyr/build_dev.sh @@ -1,5 +1,5 @@ #! /usr/bin/env bash -NCS_SDK_VERSION=v2.7.0 +NCS_SDK_VERSION=v3.0.2 docker build \ --build-arg "NCS_SDK_VERSION=$NCS_SDK_VERSION" \ diff --git a/ncs-zephyr/build_zsh.sh b/ncs-zephyr/build_zsh.sh index fc0f9dd..39ab464 100755 --- a/ncs-zephyr/build_zsh.sh +++ b/ncs-zephyr/build_zsh.sh @@ -1,5 +1,5 @@ #! /usr/bin/env bash -NCS_SDK_VERSION=v2.7.0 +NCS_SDK_VERSION=v3.0.2 docker build \ --build-arg "NCS_SDK_VERSION=$NCS_SDK_VERSION" \ diff --git a/ncs-zephyr/run.sh b/ncs-zephyr/run.sh index e8186f4..d216b5a 100755 --- a/ncs-zephyr/run.sh +++ b/ncs-zephyr/run.sh @@ -27,4 +27,4 @@ docker run -it --rm \ --publish 8080:8080 \ --publish 8081:8081 \ --publish 8090:8090 \ - irnas/ncs-zephyr-v2.7.0-zsh:latest + irnas/ncs-zephyr-v3.0.2-dev:latest