Skip to content

Commit ceaf5b5

Browse files
committed
sdk: install latest zephyr sdk 0.17.1
Install 0.17.1 Signed-off-by: Anas Nashif <[email protected]>
1 parent 4cf62c0 commit ceaf5b5

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

Dockerfile.ci

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ARG BASE_IMAGE
44
FROM ${BASE_IMAGE:-zephyrprojectrtos/ci-base:latest}
55

6-
ARG ZSDK_VERSION=0.17.1-rc4
6+
ARG ZSDK_VERSION=0.17.1
77
ENV ZSDK_VERSION=$ZSDK_VERSION
88
ARG KITWARE_NINJA_VERSION=1.11.1.g95dee.kitware.jobserver-1
99
ENV KITWARE_NINJA_VERSION=$KITWARE_NINJA_VERSION
@@ -128,14 +128,6 @@ RUN mkdir -p /opt/protoc && \
128128
ln -s /opt/protoc/bin/protoc /usr/local/bin && \
129129
rm -f protoc-${PROTOC_VERSION}-linux-${PROTOC_HOSTTYPE}.zip
130130

131-
# Install Zephyr SDK
132-
RUN mkdir -p /opt/toolchains && \
133-
cd /opt/toolchains && \
134-
wget ${WGET_ARGS} https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZSDK_VERSION}/zephyr-sdk-${ZSDK_VERSION}_linux-${HOSTTYPE}.tar.xz && \
135-
tar xf zephyr-sdk-${ZSDK_VERSION}_linux-${HOSTTYPE}.tar.xz && \
136-
zephyr-sdk-${ZSDK_VERSION}/setup.sh -t all -h -c && \
137-
rm zephyr-sdk-${ZSDK_VERSION}_linux-${HOSTTYPE}.tar.xz
138-
139131
# Install FVP
140132
#
141133
# Ecosystem FVP License permits redistribution (refer to the relevant license available in the container).
@@ -175,6 +167,15 @@ RUN set -o pipefail && \
175167
; done && \
176168
ln -s /opt/fvps/*_pkg/models/*/FVP_* /usr/local/bin
177169

170+
# Install Zephyr SDK
171+
RUN mkdir -p /opt/toolchains && \
172+
cd /opt/toolchains && \
173+
wget ${WGET_ARGS} https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZSDK_VERSION}/zephyr-sdk-${ZSDK_VERSION}_linux-${HOSTTYPE}.tar.xz && \
174+
tar xf zephyr-sdk-${ZSDK_VERSION}_linux-${HOSTTYPE}.tar.xz && \
175+
zephyr-sdk-${ZSDK_VERSION}/setup.sh -t all -h -c && \
176+
rm zephyr-sdk-${ZSDK_VERSION}_linux-${HOSTTYPE}.tar.xz
177+
178+
178179
# Clean up stale packages
179180
RUN apt-get clean -y && \
180181
apt-get autoremove --purge -y && \

0 commit comments

Comments
 (0)