Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions .devcontainer/linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,17 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&& apt-get clean -y\
&& update-alternatives --install /usr/bin/python python /usr/bin/python3 50

# Install wasi-sdk
RUN mkdir /opt/wasi-sdk && \
curl -sSL https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$WASI_SDK_VERSION/wasi-sdk-$WASI_SDK_VERSION.0-$(uname -m | sed s/aarch64/arm64/)-linux.tar.gz | \
tar zxvf - --strip-components=1 -C /opt/wasi-sdk
# Install wasi-sdk (pre-built binaries available for x86_64 and arm64 only)
RUN ARCH=$(uname -m); \
if [ "$ARCH" = "aarch64" ]; then ARCH=arm64; fi; \
if [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "arm64" ]; then \
mkdir /opt/wasi-sdk && \
curl -sSL https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$WASI_SDK_VERSION/wasi-sdk-$WASI_SDK_VERSION.0-${ARCH}-linux.tar.gz | \
tar zxvf - --strip-components=1 -C /opt/wasi-sdk; \
else \
mkdir -p /opt/wasi-sdk; \
echo "WASI-SDK not available for $(uname -m), skipping (use -DOCRE_BUILD_DEMO_CONTAINERS=OFF)"; \
fi

FROM ocre-ci AS ocre-dev

Expand Down
18 changes: 13 additions & 5 deletions .devcontainer/zephyr/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,17 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&& apt-get clean -y\
&& update-alternatives --install /usr/bin/python python /usr/bin/python3 50

# Install wasi-sdk
RUN mkdir /opt/wasi-sdk && \
curl -sSL https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$WASI_SDK_VERSION/wasi-sdk-$WASI_SDK_VERSION.0-$(uname -m | sed s/aarch64/arm64/)-linux.tar.gz | \
tar zxvf - --strip-components=1 -C /opt/wasi-sdk
# Install wasi-sdk (pre-built binaries available for x86_64 and arm64 only)
RUN ARCH=$(uname -m); \
if [ "$ARCH" = "aarch64" ]; then ARCH=arm64; fi; \
if [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "arm64" ]; then \
mkdir /opt/wasi-sdk && \
curl -sSL https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$WASI_SDK_VERSION/wasi-sdk-$WASI_SDK_VERSION.0-${ARCH}-linux.tar.gz | \
tar zxvf - --strip-components=1 -C /opt/wasi-sdk; \
else \
mkdir -p /opt/wasi-sdk; \
echo "WASI-SDK not available for $(uname -m), skipping (use -DOCRE_BUILD_DEMO_CONTAINERS=OFF)"; \
fi

RUN python -m venv /opt/zephyr-venv && \
. /opt/zephyr-venv/bin/activate && \
Expand All @@ -78,7 +85,8 @@ RUN . /opt/zephyr-venv/bin/activate && \
west sdk install --install-base /opt -t \
x86_64-zephyr-elf \
aarch64-zephyr-elf \
arm-zephyr-eabi
arm-zephyr-eabi \
riscv64-zephyr-elf

FROM base AS ocre-ci

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/zephyr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ jobs:
- pico_plus2/rp2350b/m33
- native_sim/native/64
- b_u585i_iot02a
- qemu_riscv64
app:
- mini
- demo
Expand Down
Loading