Skip to content
Merged
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
6 changes: 3 additions & 3 deletions .devcontainer/ubuntu_25.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ RUN wget -nd -P /tmp/ https://github.com/watchexec/watchexec/releases/downlo
&& dpkg -i /tmp/watchexec-2.3.0-$(uname -m)-unknown-linux-gnu.deb \
&& rm -f /tmp/watchexec-2.3.0-$(uname -m)-unknown-linux-gnu.deb

RUN wget -nd -P /tmp/ https://github.com/bytecodealliance/wasmtime/releases/download/v31.0.0/wasmtime-v31.0.0-$(uname -m)-linux.tar.xz \
&& tar -C /usr/local/bin -xvf /tmp/wasmtime-v31.0.0-$(uname -m)-linux.tar.xz --strip-components=1 --wildcards 'wasmtime-*-linux/wasmtime' \
&& rm -f /tmp/wasmtime-v31.0.0-$(uname -m)-linux.tar.xz
RUN wget -nd -P /tmp/ https://github.com/bytecodealliance/wasmtime/releases/download/v35.0.0/wasmtime-v35.0.0-$(uname -m)-linux.tar.xz \
&& tar -C /usr/local/bin -xvf /tmp/wasmtime-v35.0.0-$(uname -m)-linux.tar.xz --strip-components=1 --wildcards 'wasmtime-*-linux/wasmtime' \
&& rm -f /tmp/wasmtime-v35.0.0-$(uname -m)-linux.tar.xz
16 changes: 5 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ jobs:
runs-on: ubuntu-latest

env:
WASMTIME_VERSION: 31.0.0
WASMTIME_VERSION: 35.0.0

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -267,16 +267,10 @@ jobs:
with:
name: cxx-wasi
path: |
build.wasi/install/
!build.wasi/install/usr/lib/*.a
!build.wasi/install/usr/lib/cmake
!build.wasi/install/usr/lib/wasi-sysroot/lib
!build.wasi/install/usr/lib/wasi-sysroot/share
!build.wasi/install/usr/lib/wasi-sysroot/include/
!build.wasi/install/usr/include/wasm32-wasi-threads
!build.wasi/install/usr/include/wasm32-wasip1
!build.wasi/install/usr/include/wasm32-wasip1-threads
!build.wasi/install/usr/include/wasm32-wasip2
build.wasi/install/usr/bin
build.wasi/install/usr/lib/cxx
build.wasi/install/usr/lib/wasi-sysroot/include/c++
build.wasi/install/usr/lib/wasi-sysroot/include/wasm32-wasi
retention-days: 1

release-please:
Expand Down
6 changes: 4 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ option(CXX_LIBCXX_WITH_CLANG "Link with libc++" OFF)
option(CXX_BUILD_TESTS "Build tests" ON)
option(CXX_INTERPROCEDURAL_OPTIMIZATION "Enable interprocedural optimization" OFF)

find_package(Threads)
if(NOT CMAKE_SYSTEM_NAME STREQUAL "WASI")
find_package(Threads)
endif()

if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CXX_LIBCXX_WITH_CLANG)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
Expand Down Expand Up @@ -109,7 +111,7 @@ set_target_properties(nlohmann_json::nlohmann_json PROPERTIES

FetchContent_Declare(
wasi_sysroot
URL https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sysroot-25.0.tar.gz
URL https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-27/wasi-sysroot-27.0.tar.gz
)

FetchContent_MakeAvailable(wasi_sysroot)
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.emsdk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM emscripten/emsdk:4.0.6 as em
FROM emscripten/emsdk:4.0.12 as em

RUN apt-get update && apt-get install -y \
ninja-build \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.wasi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/webassembly/wasi-sdk:wasi-sdk-25 as wasi
FROM ghcr.io/webassembly/wasi-sdk:wasi-sdk-27

RUN apt-get update && apt-get install -y \
g++ \
Expand Down
Loading
Loading