Merge pull request #3 from swiftwasm/katei/check-ci-image-build

Update WASI engine

Author: kateinoigakukun

.github/workflows/ci-image.yml

@@ -1,6 +1,8 @@
 name: Publish Docker CI image
 on:
   workflow_dispatch: {}
+  pull_request:
+    branches: [main]
   push:
     branches: [main]
 
@@ -39,5 +41,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           context: .
           file: ${{ matrix.dockerfile }}
-          push: true
+          push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
           tags: ${{ join(matrix.tags, ',') }}

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

@@ -1,7 +1,7 @@
-install_wasmer() {
-  export WASMER_DIR="${WASMER_DIR:-/opt/wasmer}"
-  curl https://get.wasmer.io -sSfL | sh -s "2.3.0"
-  ln -sf "$WASMER_DIR/bin/wasmer" "$PREFIX/bin/wasmer"
+install_wasmtime() {
+  export WASMTIME_HOME="${WASMTIME_HOME:-$PREFIX/wasmtime}"
+  curl https://wasmtime.dev/install.sh -sSf | bash /dev/stdin --version v10.0.1
+  ln -sf "$WASMTIME_HOME/bin/wasmtime" "$PREFIX/bin/wasmtime"
 }
 
 install_cmake() {

swift-ci/main/ubuntu/18.04/Dockerfile

@@ -35,11 +35,9 @@ RUN apt -y update && apt -y install \
 
 RUN apt-get install -y \
   # FIXME(katei): curl cli dependency is required for downloading build-sdk at build-time
-  curl                 \
-  # FIXME(katei): libtinfo.so.5 is required for old wasmer. See https://github.com/wasmerio/wasmer/issues/1651
-  libtinfo5
+  curl
 COPY ./swift-ci/main/install-extra-packages.sh /tmp/install-extra-packages.sh
-RUN /tmp/install-extra-packages.sh wasmer cmake sccache && rm /tmp/install-extra-packages.sh
+RUN /tmp/install-extra-packages.sh wasmtime cmake sccache && rm /tmp/install-extra-packages.sh
 
 USER build-user
 

swift-ci/main/ubuntu/20.04/Dockerfile

@@ -33,12 +33,10 @@ RUN apt-get -y update && apt-get -y install \
   uuid-dev
 RUN apt-get install -y \
   # FIXME(katei): curl cli dependency is required for downloading build-sdk at build-time
-  curl                 \
-  # FIXME(katei): libtinfo.so.5 is required for old wasmer. See https://github.com/wasmerio/wasmer/issues/1651
-  libtinfo5
+  curl
 
 COPY ./swift-ci/main/install-extra-packages.sh /tmp/install-extra-packages.sh
-RUN /tmp/install-extra-packages.sh wasmer cmake sccache && rm /tmp/install-extra-packages.sh
+RUN /tmp/install-extra-packages.sh wasmtime cmake sccache && rm /tmp/install-extra-packages.sh
 
 USER build-user
 

swift-ci/main/ubuntu/22.04/Dockerfile

@@ -34,12 +34,10 @@ RUN apt-get -y update && apt-get -y install \
 
 RUN apt-get install -y \
   # FIXME(katei): curl cli dependency is required for downloading build-sdk at build-time
-  curl                 \
-  # FIXME(katei): libtinfo.so.5 is required for old wasmer. See https://github.com/wasmerio/wasmer/issues/1651
-  libtinfo5
+  curl
 
 COPY ./swift-ci/main/install-extra-packages.sh /tmp/install-extra-packages.sh
-RUN /tmp/install-extra-packages.sh wasmer cmake sccache && rm /tmp/install-extra-packages.sh
+RUN /tmp/install-extra-packages.sh wasmtime cmake sccache && rm /tmp/install-extra-packages.sh
 
 USER build-user