From 62f1a32aac6be382ebfc0893c833878fd389e309 Mon Sep 17 00:00:00 2001 From: Crypt Keeper <64215+codefromthecrypt@users.noreply.github.com> Date: Tue, 1 Nov 2022 15:02:30 +0800 Subject: [PATCH] Updates test dependencies (#834) Signed-off-by: Adrian Cole --- .github/workflows/commit.yaml | 5 ++--- .github/workflows/examples.yaml | 8 +++---- internal/integration_test/vs/time/go.mod | 4 +--- internal/integration_test/vs/time/go.sum | 4 ++-- internal/integration_test/vs/wasmedge/go.mod | 2 +- internal/integration_test/vs/wasmedge/go.sum | 4 ++-- internal/integration_test/vs/wasmtime/go.mod | 2 +- internal/integration_test/vs/wasmtime/go.sum | 22 ++++++++++++++++++-- 8 files changed, 33 insertions(+), 18 deletions(-) diff --git a/.github/workflows/commit.yaml b/.github/workflows/commit.yaml index 75bca9c3..45ad459c 100644 --- a/.github/workflows/commit.yaml +++ b/.github/workflows/commit.yaml @@ -27,7 +27,7 @@ jobs: steps: - name: Install latest wast2json run: | # Needed for build.spectest. wabt includes wast2json. - wabt_version=1.0.29 + wabt_version=1.0.30 wabt_url=https://github.com/WebAssembly/wabt/releases/download/${wabt_version}/wabt-${wabt_version}-ubuntu.tar.gz curl -sSL ${wabt_url} | tar --strip-components 2 -C /usr/local/bin -xzf - wabt-${wabt_version}/bin/wast2json @@ -61,7 +61,6 @@ jobs: - "1.19" # Current Go version - "1.17" # Floor Go version of wazero (current - 2) - steps: - uses: actions/checkout@v3 @@ -177,7 +176,7 @@ jobs: # The version here is coupled to internal/integration_test/go.mod, but it # isn't always the same as sometimes the Go layer has a broken release. env: - WASMEDGE_VERSION: 0.11.0 + WASMEDGE_VERSION: 0.11.1 - uses: actions/checkout@v3 diff --git a/.github/workflows/examples.yaml b/.github/workflows/examples.yaml index ebcd60b1..7a6df919 100644 --- a/.github/workflows/examples.yaml +++ b/.github/workflows/examples.yaml @@ -16,8 +16,8 @@ on: - 'Makefile' env: - EMSDK_VERSION: "3.1.20" - TINYGO_VERSION: "0.25.0" + EMSDK_VERSION: "3.1.24" + TINYGO_VERSION: "0.26.0" jobs: # Not all toolchains are idempotent when generating wasm, so we don't check @@ -26,10 +26,10 @@ jobs: name: Build examples runs-on: ubuntu-20.04 strategy: - matrix: # Use versions consistent with wazero's Go support policy. + matrix: # Use versions consistent with TinyGo. go-version: - "1.19" # Current Go version - - "1.17" # Floor Go version of wazero (current - 2) + - "1.18" # Floor Go version of latest TinyGo steps: - name: Checkout diff --git a/internal/integration_test/vs/time/go.mod b/internal/integration_test/vs/time/go.mod index 683367e0..1824cc54 100644 --- a/internal/integration_test/vs/time/go.mod +++ b/internal/integration_test/vs/time/go.mod @@ -2,8 +2,6 @@ module github.com/tetratelabs/wazero/internal/integration_test/vs/clock go 1.17 -require github.com/tetratelabs/wazero v0.0.0 - -require golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect +require golang.org/x/sys v0.1.0 replace github.com/tetratelabs/wazero => ../../../.. diff --git a/internal/integration_test/vs/time/go.sum b/internal/integration_test/vs/time/go.sum index af14a66e..b69ea857 100644 --- a/internal/integration_test/vs/time/go.sum +++ b/internal/integration_test/vs/time/go.sum @@ -1,2 +1,2 @@ -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/internal/integration_test/vs/wasmedge/go.mod b/internal/integration_test/vs/wasmedge/go.mod index a206c695..67793c8d 100644 --- a/internal/integration_test/vs/wasmedge/go.mod +++ b/internal/integration_test/vs/wasmedge/go.mod @@ -3,7 +3,7 @@ module github.com/tetratelabs/wazero/internal/integration_test/vs/wasmedge go 1.17 require ( - github.com/second-state/WasmEdge-go v0.11.0 + github.com/second-state/WasmEdge-go v0.11.1 github.com/tetratelabs/wazero v0.0.0 ) diff --git a/internal/integration_test/vs/wasmedge/go.sum b/internal/integration_test/vs/wasmedge/go.sum index 9c673288..7c48009e 100644 --- a/internal/integration_test/vs/wasmedge/go.sum +++ b/internal/integration_test/vs/wasmedge/go.sum @@ -1,2 +1,2 @@ -github.com/second-state/WasmEdge-go v0.11.0 h1:AJ9N2vzXTKQeut5LPxxUDaAKz/VpNk+OXkGSbLvJRkE= -github.com/second-state/WasmEdge-go v0.11.0/go.mod h1:HyBf9hVj1sRAjklsjc1Yvs9b5RcmthPG9z99dY78TKg= +github.com/second-state/WasmEdge-go v0.11.1 h1:ggf9mFJrnx+eD/7bQf3vF8hYVyCMTzXTXi2MNKljhC8= +github.com/second-state/WasmEdge-go v0.11.1/go.mod h1:HyBf9hVj1sRAjklsjc1Yvs9b5RcmthPG9z99dY78TKg= diff --git a/internal/integration_test/vs/wasmtime/go.mod b/internal/integration_test/vs/wasmtime/go.mod index 4804c1d7..36fda8b7 100644 --- a/internal/integration_test/vs/wasmtime/go.mod +++ b/internal/integration_test/vs/wasmtime/go.mod @@ -3,7 +3,7 @@ module github.com/tetratelabs/wazero/internal/integration_test/vs/wasmtime go 1.17 require ( - github.com/bytecodealliance/wasmtime-go v0.40.0 + github.com/bytecodealliance/wasmtime-go v1.0.0 github.com/tetratelabs/wazero v0.0.0 ) diff --git a/internal/integration_test/vs/wasmtime/go.sum b/internal/integration_test/vs/wasmtime/go.sum index 3bfba6bc..172c22aa 100644 --- a/internal/integration_test/vs/wasmtime/go.sum +++ b/internal/integration_test/vs/wasmtime/go.sum @@ -1,2 +1,20 @@ -github.com/bytecodealliance/wasmtime-go v0.40.0 h1:7cGLQEctJf09JWBl3Ai0eMl1PTrXVAjkAb27+KHfIq0= -github.com/bytecodealliance/wasmtime-go v0.40.0/go.mod h1:q320gUxqyI8yB+ZqRuaJOEnGkAnHh6WtJjMaT2CW4wI= +github.com/bytecodealliance/wasmtime-go v1.0.0 h1:9u9gqaUiaJeN5IoD1L7egD8atOnTGyJcNp8BhkL9cUU= +github.com/bytecodealliance/wasmtime-go v1.0.0/go.mod h1:jjlqQbWUfVSbehpErw3UoWFndBXRRMvfikYH6KsCwOg= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=