Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to wasi-sdk-24.0 #42

Merged
merged 3 commits into from
Oct 2, 2024
Merged

Update to wasi-sdk-24.0 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09217a7
Update to wasi-sdk-24.0
swatanabe Sep 10, 2024
1857219
Fix clang version in psibase contributor
swatanabe Sep 10, 2024
370a77b
Fix wasi-sysroot location
swatanabe Sep 25, 2024
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
2 changes: 1 addition & 1 deletion docker/psibase-contributor.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get update \
&& apt-get install -yq \
apt-transport-https \
clang-format-16 \
clang-format-18 \
curl \
gdb \
gnupg2 \
Expand Down
29 changes: 15 additions & 14 deletions docker/ubuntu-2004-builder.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ RUN export DEBIAN_FRONTEND=noninteractive \
zstd \
# Clang / LLVM
&& wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc \
&& add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main" \
&& add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-18 main" \
&& apt-get update \
&& apt-get install -yq \
clang-16 \
libclang-16-dev \
lld-16 \
llvm-16 \
clang-18 \
libclang-18-dev \
lld-18 \
llvm-18 \
&& apt-get clean -yq \
&& rm -rf /var/lib/apt/lists/*

Expand Down Expand Up @@ -63,17 +63,18 @@ RUN cd /root \
&& cd /root \
&& rm -rf boost*

# https://github.com/WebAssembly/wasi-sdk/releases/tag/wasi-sdk-20
ENV WASI_SDK_PREFIX=/usr/lib/llvm-16
# https://github.com/WebAssembly/wasi-sdk/releases/tag/wasi-sdk-24
ENV WASI_SDK_PREFIX=/usr/lib/llvm-18
ENV PATH=${WASI_SDK_PREFIX}/bin:$PATH
RUN cd ${WASI_SDK_PREFIX}/lib/clang/16/ \
&& curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/libclang_rt.builtins-wasm32-wasi-20.0.tar.gz \
&& tar xf libclang_rt.builtins-wasm32-wasi-20.0.tar.gz \
&& rm libclang_rt.builtins-wasm32-wasi-20.0.tar.gz \
RUN cd ${WASI_SDK_PREFIX}/lib/clang/18/ \
&& curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-24/libclang_rt.builtins-wasm32-wasi-24.0.tar.gz \
&& mkdir -p lib/wasi \
&& tar xf libclang_rt.builtins-wasm32-wasi-24.0.tar.gz -C lib/wasi --strip-components=1 \
&& rm libclang_rt.builtins-wasm32-wasi-24.0.tar.gz \
&& cd ${WASI_SDK_PREFIX}/share \
&& curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/wasi-sysroot-20.0.tar.gz \
&& tar xf wasi-sysroot-20.0.tar.gz \
&& rm wasi-sysroot-20.0.tar.gz
&& curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-24/wasi-sysroot-24.0.tar.gz \
&& tar xf wasi-sysroot-24.0.tar.gz --transform 's/^[^\/]*/wasi-sysroot/' \
&& rm wasi-sysroot-24.0.tar.gz
James-Mart marked this conversation as resolved.
Show resolved Hide resolved

# Node
RUN <<EOT bash
Expand Down
29 changes: 15 additions & 14 deletions docker/ubuntu-2204-builder.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ RUN export DEBIAN_FRONTEND=noninteractive \
zstd \
# Clang / LLVM
&& wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc \
&& add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main" \
&& add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" \
&& apt-get update \
&& apt-get install -yq \
clang-16 \
libclang-16-dev \
lld-16 \
llvm-16 \
clang-18 \
libclang-18-dev \
lld-18 \
llvm-18 \
&& apt-get clean -yq \
&& rm -rf /var/lib/apt/lists/*

Expand All @@ -43,17 +43,18 @@ RUN cd /root \
&& cd /root \
&& rm -rf boost*

# https://github.com/WebAssembly/wasi-sdk/releases/tag/wasi-sdk-20
ENV WASI_SDK_PREFIX=/usr/lib/llvm-16
# https://github.com/WebAssembly/wasi-sdk/releases/tag/wasi-sdk-24
ENV WASI_SDK_PREFIX=/usr/lib/llvm-18
ENV PATH=${WASI_SDK_PREFIX}/bin:$PATH
RUN cd ${WASI_SDK_PREFIX}/lib/clang/16/ \
&& curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/libclang_rt.builtins-wasm32-wasi-20.0.tar.gz \
&& tar xf libclang_rt.builtins-wasm32-wasi-20.0.tar.gz \
&& rm libclang_rt.builtins-wasm32-wasi-20.0.tar.gz \
RUN cd ${WASI_SDK_PREFIX}/lib/clang/18/ \
&& curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-24/libclang_rt.builtins-wasm32-wasi-24.0.tar.gz \
&& mkdir -p lib/wasi \
&& tar xf libclang_rt.builtins-wasm32-wasi-24.0.tar.gz -C lib/wasi --strip-components=1 \
&& rm libclang_rt.builtins-wasm32-wasi-24.0.tar.gz \
&& cd ${WASI_SDK_PREFIX}/share \
&& curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/wasi-sysroot-20.0.tar.gz \
&& tar xf wasi-sysroot-20.0.tar.gz \
&& rm wasi-sysroot-20.0.tar.gz
&& curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-24/wasi-sysroot-24.0.tar.gz \
&& tar xf wasi-sysroot-24.0.tar.gz --transform 's/^[^\/]*/wasi-sysroot/' \
&& rm wasi-sysroot-24.0.tar.gz

RUN <<EOT bash
set -eux
Expand Down
27 changes: 14 additions & 13 deletions docker/ubuntu-2404-builder.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ RUN export DEBIAN_FRONTEND=noninteractive \
strace \
wget \
zstd \
clang-16 \
libclang-16-dev \
lld-16 \
llvm-16 \
clang-18 \
libclang-18-dev \
lld-18 \
llvm-18 \
libboost1.83-dev \
libboost-chrono1.83-dev \
libboost-date-time1.83-dev \
Expand All @@ -37,17 +37,18 @@ RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get clean -yq \
&& rm -rf /var/lib/apt/lists/*

# https://github.com/WebAssembly/wasi-sdk/releases/tag/wasi-sdk-20
ENV WASI_SDK_PREFIX=/usr/lib/llvm-16
# https://github.com/WebAssembly/wasi-sdk/releases/tag/wasi-sdk-24
ENV WASI_SDK_PREFIX=/usr/lib/llvm-18
ENV PATH=${WASI_SDK_PREFIX}/bin:$PATH
RUN cd ${WASI_SDK_PREFIX}/lib/clang/16/ \
&& curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/libclang_rt.builtins-wasm32-wasi-20.0.tar.gz \
&& tar xf libclang_rt.builtins-wasm32-wasi-20.0.tar.gz \
&& rm libclang_rt.builtins-wasm32-wasi-20.0.tar.gz \
RUN cd ${WASI_SDK_PREFIX}/lib/clang/18/ \
&& curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-24/libclang_rt.builtins-wasm32-wasi-24.0.tar.gz \
&& mkdir -p lib/wasi \
&& tar xf libclang_rt.builtins-wasm32-wasi-24.0.tar.gz -C lib/wasi --strip-components=1 \
&& rm libclang_rt.builtins-wasm32-wasi-24.0.tar.gz \
&& cd ${WASI_SDK_PREFIX}/share \
&& curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/wasi-sysroot-20.0.tar.gz \
&& tar xf wasi-sysroot-20.0.tar.gz \
&& rm wasi-sysroot-20.0.tar.gz
&& curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-24/wasi-sysroot-24.0.tar.gz \
&& tar xf wasi-sysroot-24.0.tar.gz --transform 's/^[^\/]*/wasi-sysroot/' \
&& rm wasi-sysroot-24.0.tar.gz

RUN <<EOT bash
set -eux
Expand Down