chore: update to Go 1.21

This commit is contained in:
Peter 2023-08-15 22:10:26 +02:00
parent c3490fe51b
commit b646958927
Signed by: prskr
GPG key ID: C1DB5D2E8DB512F9
6 changed files with 13 additions and 19 deletions

View file

@ -1,12 +1,12 @@
package build package build
import ( import (
sdk "code.icb4dc0.de/buildr/wasi-module-sdk-go" "log/slog"
"code.icb4dc0.de/buildr/wasi-module-sdk-go/exec"
"path/filepath" "path/filepath"
"strings" "strings"
"log/slog" sdk "code.icb4dc0.de/buildr/wasi-module-sdk-go"
"code.icb4dc0.de/buildr/wasi-module-sdk-go/exec"
) )
const ( const (
@ -14,10 +14,9 @@ const (
goArchAndGoOS = 2 goArchAndGoOS = 2
) )
var ( var _ sdk.Module = (*GoBuild)(nil)
_ sdk.Module = (*GoBuild)(nil)
// _ sdk.Helper = (*GoBuild)(nil) // _ sdk.Helper = (*GoBuild)(nil)
)
type GoBuild struct { type GoBuild struct {
Env map[string]string `hcl:"environment,optional"` Env map[string]string `hcl:"environment,optional"`

7
go.mod
View file

@ -1,11 +1,8 @@
module code.icb4dc0.de/buildr/golang-plugin module code.icb4dc0.de/buildr/golang-plugin
go 1.20 go 1.21
require ( require code.icb4dc0.de/buildr/wasi-module-sdk-go v0.0.0-20230701111906-1f0c58b1c8a4
code.icb4dc0.de/buildr/wasi-module-sdk-go v0.0.0-20230701111906-1f0c58b1c8a4
golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819
)
require ( require (
github.com/tetratelabs/tinymem v0.1.0 // indirect github.com/tetratelabs/tinymem v0.1.0 // indirect

3
go.sum
View file

@ -1,10 +1,9 @@
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/tetratelabs/tinymem v0.1.0 h1:Qza1JAg9lquPPJ/CIei5qQYx7t18KLie83O2WR6CM58= github.com/tetratelabs/tinymem v0.1.0 h1:Qza1JAg9lquPPJ/CIei5qQYx7t18KLie83O2WR6CM58=
github.com/tetratelabs/tinymem v0.1.0/go.mod h1:WFFTZFhLod6lTL+UetFAopVbGaB+KFsVcIY+RUv7NeY= github.com/tetratelabs/tinymem v0.1.0/go.mod h1:WFFTZFhLod6lTL+UetFAopVbGaB+KFsVcIY+RUv7NeY=
golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 h1:EDuYyU/MkFXllv9QF9819VlI9a4tzGuCbhG0ExK9o1U=
golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=

View file

@ -3,6 +3,7 @@ package tool
import ( import (
"context" "context"
"fmt" "fmt"
"log/slog"
"net/url" "net/url"
"os" "os"
"path" "path"
@ -11,8 +12,6 @@ import (
"strings" "strings"
"time" "time"
"golang.org/x/exp/slog"
sdk "code.icb4dc0.de/buildr/wasi-module-sdk-go" sdk "code.icb4dc0.de/buildr/wasi-module-sdk-go"
"code.icb4dc0.de/buildr/wasi-module-sdk-go/exec" "code.icb4dc0.de/buildr/wasi-module-sdk-go/exec"
) )

View file

@ -2,8 +2,7 @@ package tool
import ( import (
"maps" "maps"
"slices"
"golang.org/x/exp/slices"
) )
type GoToolState struct { type GoToolState struct {

View file

@ -1,8 +1,9 @@
package tool_test package tool_test
import ( import (
"code.icb4dc0.de/buildr/golang-plugin/tool"
"testing" "testing"
"code.icb4dc0.de/buildr/golang-plugin/tool"
) )
func TestGoTool_BinaryName(t *testing.T) { func TestGoTool_BinaryName(t *testing.T) {