Skip to content

Commit 40dc4bf

Browse files
committed
ci: Add 0.18 sdk with llvm support
Add 0.18.0-alpha4 SDK with both Gnu and LLVM toolchains. Signed-off-by: Anas Nashif <[email protected]>
1 parent 0e98153 commit 40dc4bf

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

Dockerfile.ci

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

66
ARG USERNAME=user
7-
ARG ZSDK_VERSION=0.17.1
7+
ARG ZSDK_VERSION=0.18.0-alpha4
88
ENV ZSDK_VERSION=$ZSDK_VERSION
99
ARG KITWARE_NINJA_VERSION=1.11.1.g95dee.kitware.jobserver-1
1010
ENV KITWARE_NINJA_VERSION=$KITWARE_NINJA_VERSION
@@ -169,12 +169,16 @@ RUN set -o pipefail && \
169169
ln -s /opt/fvps/*_pkg/models/*/FVP_* /usr/local/bin
170170

171171
# Install Zephyr SDK
172+
# https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.18.0-alpha4/zephyr-sdk-0.18.0-alpha4_linux-x86_64_gnu.tar.xz
172173
RUN mkdir -p /opt/toolchains && \
173174
cd /opt/toolchains && \
174-
wget ${WGET_ARGS} https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZSDK_VERSION}/zephyr-sdk-${ZSDK_VERSION}_linux-${HOSTTYPE}.tar.xz && \
175-
tar xf zephyr-sdk-${ZSDK_VERSION}_linux-${HOSTTYPE}.tar.xz && \
175+
wget ${WGET_ARGS} https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZSDK_VERSION}/zephyr-sdk-${ZSDK_VERSION}_linux-${HOSTTYPE}_gnu.tar.xz && \
176+
wget ${WGET_ARGS} https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZSDK_VERSION}/zephyr-sdk-${ZSDK_VERSION}_linux-${HOSTTYPE}_llvm.tar.xz && \
177+
tar xf zephyr-sdk-${ZSDK_VERSION}_linux-${HOSTTYPE}_gnu.tar.xz && \
178+
tar xf zephyr-sdk-${ZSDK_VERSION}_linux-${HOSTTYPE}_llvm.tar.xz && \
176179
zephyr-sdk-${ZSDK_VERSION}/setup.sh -t all -h -c && \
177-
rm zephyr-sdk-${ZSDK_VERSION}_linux-${HOSTTYPE}.tar.xz
180+
rm zephyr-sdk-${ZSDK_VERSION}_linux-${HOSTTYPE}_gnu.tar.xz && \
181+
rm zephyr-sdk-${ZSDK_VERSION}_linux-${HOSTTYPE}_llvm.tar.xz
178182

179183

180184
# Clean up stale packages

0 commit comments

Comments
 (0)