Merge pull request #209 from joonas/chore/use-go_1_24-tool

lxfontes · web-flow · commit b9e75d9e23c7 · 2025-03-12T12:09:00.000-04:00
chore: Update to Go 1.24
diff --git a/.github/workflows/component-go.yaml b/.github/workflows/component-go.yaml
@@ -15,8 +15,8 @@ on:
       - 'examples/component/**'
 
 env:
-  TINYGO_VERSION: "0.33.0"
-  GOLANGCI_VERSION: "v1.61"
+  TINYGO_VERSION: "0.36.0"
+  GOLANGCI_VERSION: "v1.64.2"
   WASH_VERSION: "0.37.0"
   WASM_TOOLS_VERSION: "1.220.0"
 
@@ -88,9 +88,6 @@ jobs:
           - http-password-checker
           - invoke
           - sqldb-postgres-query
-        tinygo-version:
-          - "0.33.0"
-          - "0.34.0"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -99,7 +96,7 @@ jobs:
           go-version-file: "./examples/component/${{ matrix.example }}/go.mod"
       - uses: acifani/setup-tinygo@b2ba42b249c7d3efdfe94166ec0f48b3191404f7 # v2.0.0
         with:
-          tinygo-version: ${{ matrix.tinygo-version }}
+          tinygo-version: ${{ env.TINYGO_VERSION }}
       - uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
         with:
           version: ${{ env.GOLANGCI_VERSION }}
diff --git a/.github/workflows/templates-go.yaml b/.github/workflows/templates-go.yaml
@@ -13,7 +13,7 @@ on:
       - "templates/**"
 
 env:
-  TINYGO_VERSION: "0.34.0"
+  TINYGO_VERSION: "0.36.0"
   GOLANGCI_VERSION: "v1.61"
   WASH_VERSION: "0.37.0"
   WASM_TOOLS_VERSION: "1.220.0"
diff --git a/component/.golangci.yaml b/component/.golangci.yaml
@@ -3,14 +3,16 @@ run:
   modules-download-mode: readonly
 
 output:
-  uniq-by-line: false
   show-stats: true
   sort-results: true
   sort-order:
     - linter
     - severity
     - file
 
+issues:
+  uniq-by-line: false
+
 linters:
   enable:
     - gofmt
diff --git a/component/go.mod b/component/go.mod
@@ -1,6 +1,6 @@
 module go.wasmcloud.dev/component
 
-go 1.23.0
+go 1.24
 
 require (
 	github.com/samber/slog-common v0.18.1
@@ -22,3 +22,5 @@ require (
 	golang.org/x/sys v0.29.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 )
+
+tool go.bytecodealliance.org/cmd/wit-bindgen-go
diff --git a/component/sdk.go b/component/sdk.go
@@ -1,6 +1,6 @@
 package component
 
-//go:generate go run go.bytecodealliance.org/cmd/wit-bindgen-go generate --world sdk --out gen ./wit
+//go:generate go tool wit-bindgen-go generate --world sdk --out gen ./wit
 
 import (
 	"embed"
diff --git a/component/tools.go b/component/tools.go
diff --git a/examples/component/http-client/go.mod b/examples/component/http-client/go.mod
@@ -1,6 +1,6 @@
 module github.com/wasmCloud/go/examples/component/http-client
 
-go 1.23.0
+go 1.24
 
 require (
 	go.bytecodealliance.org v0.5.0
@@ -21,5 +21,7 @@ require (
 	golang.org/x/sys v0.29.0 // indirect
 )
 
+tool go.bytecodealliance.org/cmd/wit-bindgen-go
+
 // NOTE(lxf): Remove this line if running outside of wasmCloud/go repository
 replace go.wasmcloud.dev/component => ../../../component
diff --git a/examples/component/http-client/main.go b/examples/component/http-client/main.go
@@ -1,6 +1,6 @@
 package main
 
-//go:generate go run go.bytecodealliance.org/cmd/wit-bindgen-go generate --world example --out gen ./wit
+//go:generate go tool wit-bindgen-go generate --world example --out gen ./wit
 
 import (
 	"io"
diff --git a/examples/component/http-client/tools.go b/examples/component/http-client/tools.go
diff --git a/examples/component/http-keyvalue-crud/go.mod b/examples/component/http-keyvalue-crud/go.mod
@@ -1,6 +1,6 @@
 module github.com/wasmCloud/go/examples/component/http-keyvalue-crud
 
-go 1.23.0
+go 1.24
 
 require (
 	github.com/julienschmidt/httprouter v1.3.0
@@ -25,3 +25,8 @@ require (
 	golang.org/x/sys v0.29.0 // indirect
 	golang.org/x/tools v0.28.0 // indirect
 )
+
+tool (
+	go.bytecodealliance.org/cmd/wit-bindgen-go
+	go.wasmcloud.dev/wadge/cmd/wadge-bindgen-go
+)
diff --git a/examples/component/http-keyvalue-crud/main.go b/examples/component/http-keyvalue-crud/main.go
@@ -1,4 +1,4 @@
-//go:generate go run go.bytecodealliance.org/cmd/wit-bindgen-go generate --world component --out gen ./wit
+//go:generate go tool wit-bindgen-go generate --world component --out gen ./wit
 package main
 
 import (
diff --git a/examples/component/http-keyvalue-crud/main_test.go b/examples/component/http-keyvalue-crud/main_test.go
@@ -1,4 +1,4 @@
-//go:generate go run go.wasmcloud.dev/wadge/cmd/wadge-bindgen-go
+//go:generate go tool wadge-bindgen-go
 
 package main
 
@@ -47,7 +47,7 @@ func TestIncomingHandler(t *testing.T) {
 		}
 		defer resp.Body.Close()
 
-		if want, got := []byte("Hello from Go!\n"), buf; !bytes.Equal(want, got) {
+		if want, got := []byte("{\"message\":\"GET, POST, or DELETE to /crud/<key> (with JSON payload for POSTs)\"}\n"), buf; !bytes.Equal(want, got) {
 			t.Fatalf("unexpected response body: want %q, got %q", want, got)
 		}
 	})
diff --git a/examples/component/http-keyvalue-crud/tools.go b/examples/component/http-keyvalue-crud/tools.go
diff --git a/examples/component/http-password-checker/go.mod b/examples/component/http-password-checker/go.mod
@@ -1,6 +1,6 @@
 module http-password-checker
 
-go 1.23.0
+go 1.24
 
 require (
 	github.com/stretchr/testify v1.10.0
@@ -29,3 +29,8 @@ require (
 	golang.org/x/tools v0.29.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
+
+tool (
+	go.bytecodealliance.org/cmd/wit-bindgen-go
+	go.wasmcloud.dev/wadge/cmd/wadge-bindgen-go
+)
diff --git a/examples/component/http-password-checker/main.go b/examples/component/http-password-checker/main.go
@@ -1,4 +1,4 @@
-//go:generate go run go.bytecodealliance.org/cmd/wit-bindgen-go generate --world hello --out gen ./wit
+//go:generate go tool wit-bindgen-go generate --world hello --out gen ./wit
 package main
 
 import (
diff --git a/examples/component/http-password-checker/main_test.go b/examples/component/http-password-checker/main_test.go
@@ -1,4 +1,4 @@
-//go:generate go run go.wasmcloud.dev/wadge/cmd/wadge-bindgen-go -test
+//go:generate go tool wadge-bindgen-go -test
 
 package main
 
diff --git a/examples/component/http-password-checker/tools.go b/examples/component/http-password-checker/tools.go
diff --git a/examples/component/http-server/go.mod b/examples/component/http-server/go.mod
@@ -1,6 +1,6 @@
 module github.com/wasmCloud/go/examples/component/http-server
 
-go 1.23.0
+go 1.24
 
 require (
 	github.com/stretchr/testify v1.10.0
@@ -35,3 +35,8 @@ require (
 
 // NOTE(lxf): Remove this line if running outside of wasmCloud/go repository
 replace go.wasmcloud.dev/component => ../../../component
+
+tool (
+	go.bytecodealliance.org/cmd/wit-bindgen-go
+	go.wasmcloud.dev/wadge/cmd/wadge-bindgen-go
+)
diff --git a/examples/component/http-server/main.go b/examples/component/http-server/main.go
@@ -1,4 +1,4 @@
-//go:generate go run go.bytecodealliance.org/cmd/wit-bindgen-go generate --world example --out gen ./wit
+//go:generate go tool wit-bindgen-go generate --world example --out gen ./wit
 
 package main
 
diff --git a/examples/component/http-server/main_test.go b/examples/component/http-server/main_test.go
@@ -1,4 +1,4 @@
-//go:generate go run go.wasmcloud.dev/wadge/cmd/wadge-bindgen-go -test
+//go:generate go tool wadge-bindgen-go -test
 
 package main
 
diff --git a/examples/component/http-server/tools.go b/examples/component/http-server/tools.go
diff --git a/examples/component/invoke/go.mod b/examples/component/invoke/go.mod
@@ -1,6 +1,6 @@
 module github.com/wasmCloud/go/examples/component/invoke
 
-go 1.23.0
+go 1.24
 
 require (
 	github.com/stretchr/testify v1.10.0
@@ -33,3 +33,8 @@ require (
 
 // NOTE(lxf): Remove this line if running outside of wasmCloud/go repository
 replace go.wasmcloud.dev/component => ../../../component
+
+tool (
+	go.bytecodealliance.org/cmd/wit-bindgen-go
+	go.wasmcloud.dev/wadge/cmd/wadge-bindgen-go
+)
diff --git a/examples/component/invoke/main.go b/examples/component/invoke/main.go
@@ -1,4 +1,4 @@
-//go:generate go run go.bytecodealliance.org/cmd/wit-bindgen-go generate --world example --out gen ./wit
+//go:generate go tool wit-bindgen-go generate --world example --out gen ./wit
 
 package main
 
diff --git a/examples/component/invoke/main_test.go b/examples/component/invoke/main_test.go
@@ -1,4 +1,4 @@
-//go:generate go run go.wasmcloud.dev/wadge/cmd/wadge-bindgen-go -test
+//go:generate go tool wadge-bindgen-go -test
 
 package main
 
diff --git a/examples/component/invoke/tools.go b/examples/component/invoke/tools.go
diff --git a/examples/component/wasitel-http/go.mod b/examples/component/wasitel-http/go.mod
@@ -1,6 +1,6 @@
 module wasitel-http
 
-go 1.23.2
+go 1.24
 
 require (
 	go.bytecodealliance.org v0.5.0
@@ -32,3 +32,5 @@ require (
 	golang.org/x/mod v0.22.0 // indirect
 	golang.org/x/sys v0.29.0 // indirect
 )
+
+tool go.bytecodealliance.org/cmd/wit-bindgen-go
diff --git a/examples/component/wasitel-http/main.go b/examples/component/wasitel-http/main.go
@@ -1,4 +1,4 @@
-//go:generate go run go.bytecodealliance.org/cmd/wit-bindgen-go generate --world example --out gen ./wit
+//go:generate go tool wit-bindgen-go generate --world example --out gen ./wit
 
 package main
 
diff --git a/examples/component/wasitel-http/tools.go b/examples/component/wasitel-http/tools.go

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//go:generate go run go.bytecodealliance.org/cmd/wit-bindgen-go generate --world component --out gen ./wit`
	`1`	`+//go:generate go tool wit-bindgen-go generate --world component --out gen ./wit`
`2`	`2`	`package main`
`3`	`3`
`4`	`4`	`import (`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//go:generate go run go.wasmcloud.dev/wadge/cmd/wadge-bindgen-go`
	`1`	`+//go:generate go tool wadge-bindgen-go`
`2`	`2`
`3`	`3`	`package main`
`4`	`4`
`@@ -47,7 +47,7 @@ func TestIncomingHandler(t *testing.T) {`
`47`	`47`	`}`
`48`	`48`	`defer resp.Body.Close()`
`49`	`49`
`50`		`- if want, got := []byte("Hello from Go!\n"), buf; !bytes.Equal(want, got) {`
	`50`	`+ if want, got := []byte("{\"message\":\"GET, POST, or DELETE to /crud/<key> (with JSON payload for POSTs)\"}\n"), buf; !bytes.Equal(want, got) {`
`51`	`51`	`t.Fatalf("unexpected response body: want %q, got %q", want, got)`
`52`	`52`	`}`
`53`	`53`	`})`