Skip to content

Commit

Permalink
[nrfconnect] Bump nRF Connect SDK version in Docker (#27004)
Browse files Browse the repository at this point in the history
Regular update of nRF Connect SDK to 2.4.0 version
  • Loading branch information
kkasperczyk-no authored and pull[bot] committed Dec 11, 2023
1 parent 27d1d62 commit 4779233
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions integrations/docker/images/chip-build-nrf-platform/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG VERSION=latest

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

SHELL ["/bin/bash", "-o", "pipefail", "-c"]
WORKDIR /opt/NordicSemiconductor/nRF5_tools
Expand All @@ -15,14 +15,14 @@ RUN set -x \
| tar zxvf - \
&& tar xvf JLink_Linux_V780c_x86_64.tgz \
&& rm JLink_Linux_V780c_x86_64.* \
&& 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 \
| tar zxvf - \
&& zephyr-sdk-0.15.2/setup.sh -t arm-zephyr-eabi \
&& 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 \
&& tar xvf zephyr-sdk-0.16.0_linux-x86_64_minimal.tar.xz \
&& zephyr-sdk-0.16.0/setup.sh -t arm-zephyr-eabi \
&& : # last line

WORKDIR /opt/NordicSemiconductor/nrfconnect
RUN set -x \
&& python3 -m pip install -U --no-cache-dir west==0.14.0 \
&& python3 -m pip install -U --no-cache-dir west==1.0.0 \
&& west init -m https://github.com/nrfconnect/sdk-nrf --mr "$NCS_REVISION" \
&& west config update.narrow true \
&& west config update.fetch smart \
Expand Down Expand Up @@ -62,6 +62,6 @@ ENV LD_LIBRARY_PATH=${NRF5_TOOLS_ROOT}/JLink_Linux_V780c_x86_64:${LD_LIBRARY_PAT
ENV LC_ALL=C.UTF-8
ENV LANG=C.UTF-8
ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr
ENV ZEPHYR_SDK_INSTALL_DIR=${NRF5_TOOLS_ROOT}/zephyr-sdk-0.15.2
ENV ZEPHYR_SDK_INSTALL_DIR=${NRF5_TOOLS_ROOT}/zephyr-sdk-0.16.0
ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr
ENV ZEPHYR_TOOLCHAIN_PATH=${ZEPHYR_SDK_INSTALL_DIR}/arm-zephyr-eabi
2 changes: 1 addition & 1 deletion integrations/docker/images/chip-build/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.7.15 Version bump reason: [Java] Set JAVA_PATH in chip-build-java and vscode
0.7.16 Version bump reason: [nrfconnect] Update nRF Connect SDK version.
2 changes: 1 addition & 1 deletion scripts/build/builders/nrf.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ def generate(self):
zephyr_base = os.environ['ZEPHYR_BASE']
nrfconnect_sdk = os.path.dirname(zephyr_base)
zephyr_sdk_dir = os.environ.get('ZEPHYR_SDK_INSTALL_DIR') or os.path.join(
os.environ['NRF5_TOOLS_ROOT'], 'zephyr-sdk-0.15.2')
os.environ['NRF5_TOOLS_ROOT'], 'zephyr-sdk-0.16.0')

# NRF builds will both try to change .west/config in nrfconnect and
# overall perform a git fetch on that location
Expand Down
2 changes: 1 addition & 1 deletion scripts/examples/nrfconnect_example.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ source "../scripts/activate.sh"
export ZEPHYR_TOOLCHAIN_VARIANT=zephyr

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

# Set ccache base directory to improve the cache hit ratio
Expand Down

0 comments on commit 4779233

Please sign in to comment.