Skip to content

Commit 6038393

Browse files
kkasperczyk-nopull[bot]
authored andcommitted
[nrfconnect] Bump nRF Connect SDK version in Docker (#27004)
Regular update of nRF Connect SDK to 2.4.0 version
1 parent b71839b commit 6038393

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

integrations/docker/images/chip-build-nrf-platform/Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ARG VERSION=latest
66

77
FROM connectedhomeip/chip-build:${VERSION} as build
88
# Compatible Nordic Connect SDK revision.
9-
ARG NCS_REVISION=v2.3.0
9+
ARG NCS_REVISION=v2.4.0
1010

1111
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
1212
WORKDIR /opt/NordicSemiconductor/nRF5_tools
@@ -15,14 +15,14 @@ RUN set -x \
1515
| tar zxvf - \
1616
&& tar xvf JLink_Linux_V780c_x86_64.tgz \
1717
&& rm JLink_Linux_V780c_x86_64.* \
18-
&& curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.15.2/zephyr-sdk-0.15.2_linux-x86_64_minimal.tar.gz \
19-
| tar zxvf - \
20-
&& zephyr-sdk-0.15.2/setup.sh -t arm-zephyr-eabi \
18+
&& curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.0/zephyr-sdk-0.16.0_linux-x86_64_minimal.tar.xz --output zephyr-sdk-0.16.0_linux-x86_64_minimal.tar.xz \
19+
&& tar xvf zephyr-sdk-0.16.0_linux-x86_64_minimal.tar.xz \
20+
&& zephyr-sdk-0.16.0/setup.sh -t arm-zephyr-eabi \
2121
&& : # last line
2222

2323
WORKDIR /opt/NordicSemiconductor/nrfconnect
2424
RUN set -x \
25-
&& python3 -m pip install -U --no-cache-dir west==0.14.0 \
25+
&& python3 -m pip install -U --no-cache-dir west==1.0.0 \
2626
&& west init -m https://github.com/nrfconnect/sdk-nrf --mr "$NCS_REVISION" \
2727
&& west config update.narrow true \
2828
&& west config update.fetch smart \
@@ -62,6 +62,6 @@ ENV LD_LIBRARY_PATH=${NRF5_TOOLS_ROOT}/JLink_Linux_V780c_x86_64:${LD_LIBRARY_PAT
6262
ENV LC_ALL=C.UTF-8
6363
ENV LANG=C.UTF-8
6464
ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr
65-
ENV ZEPHYR_SDK_INSTALL_DIR=${NRF5_TOOLS_ROOT}/zephyr-sdk-0.15.2
65+
ENV ZEPHYR_SDK_INSTALL_DIR=${NRF5_TOOLS_ROOT}/zephyr-sdk-0.16.0
6666
ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr
6767
ENV ZEPHYR_TOOLCHAIN_PATH=${ZEPHYR_SDK_INSTALL_DIR}/arm-zephyr-eabi
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.7.15 Version bump reason: [Java] Set JAVA_PATH in chip-build-java and vscode
1+
0.7.16 Version bump reason: [nrfconnect] Update nRF Connect SDK version.

scripts/build/builders/nrf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ def generate(self):
161161
zephyr_base = os.environ['ZEPHYR_BASE']
162162
nrfconnect_sdk = os.path.dirname(zephyr_base)
163163
zephyr_sdk_dir = os.environ.get('ZEPHYR_SDK_INSTALL_DIR') or os.path.join(
164-
os.environ['NRF5_TOOLS_ROOT'], 'zephyr-sdk-0.15.2')
164+
os.environ['NRF5_TOOLS_ROOT'], 'zephyr-sdk-0.16.0')
165165

166166
# NRF builds will both try to change .west/config in nrfconnect and
167167
# overall perform a git fetch on that location

scripts/examples/nrfconnect_example.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ source "../scripts/activate.sh"
4444
export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
4545

4646
if [[ -z "$ZEPHYR_SDK_INSTALL_DIR" && -n "$NRF5_TOOLS_ROOT" ]]; then
47-
export ZEPHYR_SDK_INSTALL_DIR="$NRF5_TOOLS_ROOT"/zephyr-sdk-0.15.2
47+
export ZEPHYR_SDK_INSTALL_DIR="$NRF5_TOOLS_ROOT"/zephyr-sdk-0.16.0
4848
fi
4949

5050
# Set ccache base directory to improve the cache hit ratio

0 commit comments

Comments
 (0)