Skip to content

Commit 3fc5b47

Browse files
Use wasmtime as WASI engine
1 parent 352c8c4 commit 3fc5b47

File tree

4 files changed

+10
-16
lines changed

4 files changed

+10
-16
lines changed

swift-ci/main/install-extra-packages.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
install_wasmer() {
2-
export WASMER_DIR="${WASMER_DIR:-/opt/wasmer}"
3-
curl https://get.wasmer.io -sSfL | sh -s "2.3.0"
4-
ln -sf "$WASMER_DIR/bin/wasmer" "$PREFIX/bin/wasmer"
1+
install_wasmtime() {
2+
export WASMTIME_HOME="${WASMTIME_HOME:-$PREFIX/wasmtime}"
3+
curl https://wasmtime.dev/install.sh -sSf | bash /dev/stdin --version v10.0.1
4+
ln -sf "$WASMTIME_HOME/bin/wasmtime" "$PREFIX/bin/wasmtime"
55
}
66

77
install_cmake() {

swift-ci/main/ubuntu/18.04/Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,9 @@ RUN apt -y update && apt -y install \
3535

3636
RUN apt-get install -y \
3737
# FIXME(katei): curl cli dependency is required for downloading build-sdk at build-time
38-
curl \
39-
# FIXME(katei): libtinfo.so.5 is required for old wasmer. See https://github.com/wasmerio/wasmer/issues/1651
40-
libtinfo5
38+
curl
4139
COPY ./swift-ci/main/install-extra-packages.sh /tmp/install-extra-packages.sh
42-
RUN /tmp/install-extra-packages.sh wasmer cmake sccache && rm /tmp/install-extra-packages.sh
40+
RUN /tmp/install-extra-packages.sh wasmtime cmake sccache && rm /tmp/install-extra-packages.sh
4341

4442
USER build-user
4543

swift-ci/main/ubuntu/20.04/Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,10 @@ RUN apt-get -y update && apt-get -y install \
3333
uuid-dev
3434
RUN apt-get install -y \
3535
# FIXME(katei): curl cli dependency is required for downloading build-sdk at build-time
36-
curl \
37-
# FIXME(katei): libtinfo.so.5 is required for old wasmer. See https://github.com/wasmerio/wasmer/issues/1651
38-
libtinfo5
36+
curl
3937

4038
COPY ./swift-ci/main/install-extra-packages.sh /tmp/install-extra-packages.sh
41-
RUN /tmp/install-extra-packages.sh wasmer cmake sccache && rm /tmp/install-extra-packages.sh
39+
RUN /tmp/install-extra-packages.sh wasmtime cmake sccache && rm /tmp/install-extra-packages.sh
4240

4341
USER build-user
4442

swift-ci/main/ubuntu/22.04/Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,10 @@ RUN apt-get -y update && apt-get -y install \
3434

3535
RUN apt-get install -y \
3636
# FIXME(katei): curl cli dependency is required for downloading build-sdk at build-time
37-
curl \
38-
# FIXME(katei): libtinfo.so.5 is required for old wasmer. See https://github.com/wasmerio/wasmer/issues/1651
39-
libtinfo5
37+
curl
4038

4139
COPY ./swift-ci/main/install-extra-packages.sh /tmp/install-extra-packages.sh
42-
RUN /tmp/install-extra-packages.sh wasmer cmake sccache && rm /tmp/install-extra-packages.sh
40+
RUN /tmp/install-extra-packages.sh wasmtime cmake sccache && rm /tmp/install-extra-packages.sh
4341

4442
USER build-user
4543

0 commit comments

Comments
 (0)