From e3d52fb8625c8f0b17fa9d418f06de4af41ffb13 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 25 Feb 2025 13:03:03 -0600 Subject: [PATCH] Update wasmtime to 30.0.0 (#241) * Update wasmtime to 30.0.0 Also bump the version of this module. * Try using windows-2025 runners * Try more go versions * Try using dev-tag * Update to 30.0.2 artifacts --- .github/workflows/main.yml | 12 ++++++------ BUILD.bazel | 2 +- README.md | 18 +++++++++--------- ci/download-wasmtime.py | 2 +- example_test.go | 2 +- go.mod | 2 +- includebuild.go | 14 +++++++------- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ea10e72..bac13bd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,8 +19,8 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-latest] - go: ['1.20.x', '1.21.x'] + os: [ubuntu-latest, macos-latest, windows-2025] + go: ['1.20.x', '1.21.x', '1.22.x', '1.23.x', '1.24.x'] steps: - uses: actions/checkout@v4 @@ -51,7 +51,7 @@ jobs: bazelisk build --subcommands=pretty_print --verbose_failures :go_default_library bazelisk test --subcommands=pretty_print --verbose_failures :go_default_test # TODO: need to fix bazel tests - if: matrix.os != 'windows-latest' && false + if: runner.os != 'Windows' && false - name: Ready msys2 uses: msys2/setup-msys2@v2 with: @@ -59,7 +59,7 @@ jobs: update: true install: git mingw-w64-x86_64-toolchain path-type: inherit - if: matrix.os == 'windows-latest' + if: runner.os == 'Windows' - name: Test bazel build on Windows shell: msys2 {0} run: | @@ -67,11 +67,11 @@ jobs: bazelisk build --subcommands=pretty_print --verbose_failures --compiler=mingw-gcc :go_default_library bazelisk test --subcommands=pretty_print --verbose_failures --compiler=mingw-gcc :go_default_test # TODO: need to reenable when MinGW shenanigans are fixed - if: matrix.os == 'windows-latest' && false + if: runner.os == 'Windows' && false - name: Test vendoring on *nix shell: bash run: ./ci/test-vendoring.sh - if: matrix.os != 'windows-latest' + if: runner.os != 'Windows' coverage: runs-on: ubuntu-latest diff --git a/BUILD.bazel b/BUILD.bazel index 9c055e0..20eb59f 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -63,7 +63,7 @@ go_library( ], "//conditions:default": [], }), - importpath = "github.com/bytecodealliance/wasmtime-go/v29", + importpath = "github.com/bytecodealliance/wasmtime-go/v30", visibility = ["//visibility:public"], ) diff --git a/README.md b/README.md index 39353b6..b1303c5 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@ CI status - - Documentation + + Documentation Code Coverage @@ -25,7 +25,7 @@ ## Installation ```sh -go get -u github.com/bytecodealliance/wasmtime-go/v29@v29.0.0 +go get -u github.com/bytecodealliance/wasmtime-go/v30@v30.0.0 ``` Be sure to check out the [API documentation][api]! @@ -39,7 +39,7 @@ need to arrange to build Wasmtime and use `CGO_*` env vars to compile correctly. This project has been tested with Go 1.13 or later. -[api]: https://pkg.go.dev/github.com/bytecodealliance/wasmtime-go/v29 +[api]: https://pkg.go.dev/github.com/bytecodealliance/wasmtime-go/v30 [wasmtime]: https://github.com/bytecodealliance/wasmtime If you are a bazel user, add following to your WORKSPACE file: @@ -47,8 +47,8 @@ If you are a bazel user, add following to your WORKSPACE file: ``` go_repository( name = "com_github_bytecodealliance_wasmtime_go", - importpath = "github.com/bytecodealliance/wasmtime-go/v29", - version = "v29.0.0", + importpath = "github.com/bytecodealliance/wasmtime-go/v30", + version = "v30.0.0", ) ``` @@ -61,7 +61,7 @@ package main import ( "fmt" - "github.com/bytecodealliance/wasmtime-go/v29" + "github.com/bytecodealliance/wasmtime-go/v30" ) func main() { @@ -179,8 +179,8 @@ Once merged checkout `main` and do: $ rm .gitignore $ python3 ci/download-wasmtime.py $ git add . -$ git commit -m 'v29.0.0 release artifacts' -$ git tag v29.0.0 +$ git commit -m 'v30.0.0 release artifacts' +$ git tag v30.0.0 ``` and push up the tag diff --git a/ci/download-wasmtime.py b/ci/download-wasmtime.py index 977280d..05feb3b 100644 --- a/ci/download-wasmtime.py +++ b/ci/download-wasmtime.py @@ -10,7 +10,7 @@ import glob -version = 'v29.0.1' +version = 'v30.0.2' urls = [ ['wasmtime-{}-x86_64-mingw-c-api.zip', 'windows-x86_64'], ['wasmtime-{}-x86_64-linux-c-api.tar.xz', 'linux-x86_64'], diff --git a/example_test.go b/example_test.go index a0af8e7..dd991bc 100644 --- a/example_test.go +++ b/example_test.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/bytecodealliance/wasmtime-go/v29" + "github.com/bytecodealliance/wasmtime-go/v30" ) // Example of limiting a WebAssembly function's runtime using "fuel consumption". diff --git a/go.mod b/go.mod index af23967..c27ef85 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/bytecodealliance/wasmtime-go/v29 +module github.com/bytecodealliance/wasmtime-go/v30 go 1.18 diff --git a/includebuild.go b/includebuild.go index 27fc790..084fd2a 100644 --- a/includebuild.go +++ b/includebuild.go @@ -12,11 +12,11 @@ import ( // included in vendored dependencies. // Cf. https://github.com/golang/go/issues/26366 - _ "github.com/bytecodealliance/wasmtime-go/v29/build/include" - _ "github.com/bytecodealliance/wasmtime-go/v29/build/include/wasmtime" - _ "github.com/bytecodealliance/wasmtime-go/v29/build/linux-aarch64" - _ "github.com/bytecodealliance/wasmtime-go/v29/build/linux-x86_64" - _ "github.com/bytecodealliance/wasmtime-go/v29/build/macos-aarch64" - _ "github.com/bytecodealliance/wasmtime-go/v29/build/macos-x86_64" - _ "github.com/bytecodealliance/wasmtime-go/v29/build/windows-x86_64" + _ "github.com/bytecodealliance/wasmtime-go/v30/build/include" + _ "github.com/bytecodealliance/wasmtime-go/v30/build/include/wasmtime" + _ "github.com/bytecodealliance/wasmtime-go/v30/build/linux-aarch64" + _ "github.com/bytecodealliance/wasmtime-go/v30/build/linux-x86_64" + _ "github.com/bytecodealliance/wasmtime-go/v30/build/macos-aarch64" + _ "github.com/bytecodealliance/wasmtime-go/v30/build/macos-x86_64" + _ "github.com/bytecodealliance/wasmtime-go/v30/build/windows-x86_64" )