diff --git a/builtin/builtin.go b/builtin/builtin.go index 6220bd4..dc05570 100644 --- a/builtin/builtin.go +++ b/builtin/builtin.go @@ -78,11 +78,5 @@ func Must[T any](value T, err error) T { // returns first error, or nil if no errors // Deprecated: use `FirstNonEmpty()` func FirstError(errs ...error) error { - for _, err := range errs { - if err != nil { - return err - } - } - - return nil + return FirstNonEmpty(errs...) } diff --git a/go.mod b/go.mod index 40a2577..e9e9bca 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/function61/gokit -go 1.18 +go 1.20 require ( github.com/apex/gateway v1.1.1 diff --git a/turbobob.json b/turbobob.json index 686cf9f..266b079 100644 --- a/turbobob.json +++ b/turbobob.json @@ -6,7 +6,7 @@ "builders": [ { "name": "default", - "uses": "docker://fn61/buildkit-golang:20221017_1220_d2ee72b9", + "uses": "docker://fn61/buildkit-golang:20230329_0959_f235a7bc", "mount_destination": "/workspace", "workdir": "/workspace", "commands": {