Update to wazero 1.7.1

.github/workflows/bench.yaml

@@ -13,13 +13,10 @@ jobs:
   bench:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-go@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: go.work
-          cache: true
 
       - name: setup re2 for cgo
         run: sudo apt-get update && sudo apt-get install -y libre2-dev

.github/workflows/ci.yaml

@@ -31,13 +31,10 @@ jobs:
           - os: macos-14
             mode: tinygo
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-go@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: go.work
-          cache: true
 
       - name: setup re2 for cgo (linux)
         if: ${{ startsWith(matrix.os, 'ubuntu-') && matrix.mode == 'cgo' }}
@@ -57,10 +54,10 @@ jobs:
         if: ${{ matrix.mode == 'tinygo' }}
         uses: acifani/setup-tinygo@v1
         with:
-          tinygo-version: 0.30.0
+          tinygo-version: 0.31.2
       - name: setup wasmtime for tinygo
         if: ${{ matrix.mode == 'tinygo' }}
-        run: go install github.com/wasilibs/tools/cmd/wasmtime@e3baa6a6b2955f731f4490728b09fb87b35e27e9
+        run: go install github.com/wasilibs/tools/cmd/wasmtime@875fe73f677c58d467ee373a9e00e6cb66b268f3
 
       - name: run checks
         run: go run mage.go check
@@ -97,9 +94,7 @@ jobs:
     container:
       image: golang:alpine
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
+      - uses: actions/checkout@v4
 
       - run: if command -v gcc &> /dev/null; then echo "GCC found but not expected"; exit 321; fi
 

go.mod

@@ -1,10 +1,9 @@
 module github.com/wasilibs/go-re2
 
-go 1.18
+go 1.20
 
 require (
 	github.com/magefile/mage v1.14.0
+	github.com/tetratelabs/wazero v1.7.1
 	github.com/wasilibs/nottinygc v0.4.0
 )
-
-require github.com/tetratelabs/wazero v1.7.0

go.sum

@@ -1,6 +1,6 @@
 github.com/magefile/mage v1.14.0 h1:6QDX3g6z1YvJ4olPhT1wksUcSa/V0a1B+pJb73fBjyo=
 github.com/magefile/mage v1.14.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
-github.com/tetratelabs/wazero v1.7.0 h1:jg5qPydno59wqjpGrHph81lbtHzTrWzwwtD4cD88+hQ=
-github.com/tetratelabs/wazero v1.7.0/go.mod h1:ytl6Zuh20R/eROuyDaGPkp82O9C/DJfXAwJfQ3X6/7Y=
+github.com/tetratelabs/wazero v1.7.1 h1:QtSfd6KLc41DIMpDYlJdoMc6k7QTN246DM2+n2Y/Dx8=
+github.com/tetratelabs/wazero v1.7.1/go.mod h1:ytl6Zuh20R/eROuyDaGPkp82O9C/DJfXAwJfQ3X6/7Y=
 github.com/wasilibs/nottinygc v0.4.0 h1:h1TJMihMC4neN6Zq+WKpLxgd9xCFMw7O9ETLwY2exJQ=
 github.com/wasilibs/nottinygc v0.4.0/go.mod h1:oDcIotskuYNMpqMF23l7Z8uzD4TC0WXHK8jetlB3HIo=

go.work

@@ -1,4 +1,4 @@
-go 1.19
+go 1.20
 
 use (
 	.

internal/e2e/go.mod

@@ -1,12 +1,12 @@
 module github.com/wasilibs/go-re2/e2e
 
-go 1.19
+go 1.20
 
 require github.com/wasilibs/go-re2 v1.5.2
 
 require (
 	github.com/magefile/mage v1.14.0 // indirect
-	github.com/tetratelabs/wazero v1.7.0 // indirect
+	github.com/tetratelabs/wazero v1.7.1 // indirect
 )
 
 replace github.com/wasilibs/go-re2 => ../..

internal/e2e/go.sum

@@ -1,5 +1,4 @@
 github.com/magefile/mage v1.14.0 h1:6QDX3g6z1YvJ4olPhT1wksUcSa/V0a1B+pJb73fBjyo=
 github.com/magefile/mage v1.14.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
-github.com/tetratelabs/wazero v1.7.0 h1:jg5qPydno59wqjpGrHph81lbtHzTrWzwwtD4cD88+hQ=
-github.com/tetratelabs/wazero v1.7.0/go.mod h1:ytl6Zuh20R/eROuyDaGPkp82O9C/DJfXAwJfQ3X6/7Y=
+github.com/tetratelabs/wazero v1.7.1 h1:QtSfd6KLc41DIMpDYlJdoMc6k7QTN246DM2+n2Y/Dx8=
 github.com/wasilibs/nottinygc v0.4.0 h1:h1TJMihMC4neN6Zq+WKpLxgd9xCFMw7O9ETLwY2exJQ=

magefiles/go.mod

@@ -1,5 +1,5 @@
 module github.com/wasilibs/go-re2/magefiles
 
-go 1.18
+go 1.20
 
 require github.com/magefile/mage v1.14.0

magefiles/magefile.go

@@ -45,14 +45,15 @@ func Test() error {
 			return err
 		}
 
-		// Could invoke wazero directly but the CLI has a simpler entry point.
-		// TODO: Enable this after it runs with wazero, it currently has been verified locally with wasmtime.
-		// if err := sh.RunWithV(map[string]string{"GOOS": "wasip1", "GOARCH": "wasm"}, "go", "build", "-o", filepath.Join("build", "test.wasm"), "./internal/e2e"); err != nil {
-		//	return err
-		// }
-		// if err := sh.RunV("go", "run", "github.com/tetratelabs/wazero/cmd/wazero@v1.7.0", "run", filepath.Join("build", "test.wasm")); err != nil {
-		// 	return err
-		// }
+		if mode == "" {
+			if err := sh.RunWithV(map[string]string{"GOOS": "wasip1", "GOARCH": "wasm"}, "go", "build", "-o", filepath.Join("build", "test.wasm"), "./internal/e2e"); err != nil {
+				return err
+			}
+			// Could invoke wazero directly but the CLI has a simpler entry point.
+			if err := sh.RunV("go", "run", "github.com/tetratelabs/wazero/cmd/wazero@v1.7.1", "run", filepath.Join("build", "test.wasm")); err != nil {
+				return err
+			}
+		}
 
 		return nil
 	}

wafbench/go.mod

@@ -1,6 +1,6 @@
 module github.com/wasilibs/go-re2/wafbench
 
-go 1.19
+go 1.20
 
 require (
 	github.com/bmatcuk/doublestar/v4 v4.4.0
@@ -31,7 +31,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/petar-dambovaliev/aho-corasick v0.0.0-20211021192214-5ab2d9280aa9 // indirect
-	github.com/tetratelabs/wazero v1.7.0 // indirect
+	github.com/tetratelabs/wazero v1.7.1 // indirect
 	github.com/tidwall/gjson v1.14.3 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect

wafbench/go.sum

@@ -289,7 +289,7 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/tetratelabs/wazero v1.7.0 h1:jg5qPydno59wqjpGrHph81lbtHzTrWzwwtD4cD88+hQ=
+github.com/tetratelabs/wazero v1.7.1 h1:QtSfd6KLc41DIMpDYlJdoMc6k7QTN246DM2+n2Y/Dx8=
 github.com/tidwall/gjson v1.14.3 h1:9jvXn7olKEHU1S9vwoMGliaT8jq1vJ7IH/n9zD9Dnlw=
 github.com/tidwall/gjson v1.14.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=