diff --git a/.github/actions/stage2-setup/action.yml b/.github/actions/stage2-setup/action.yml index f43d37cfcc..d18b5ae8b2 100644 --- a/.github/actions/stage2-setup/action.yml +++ b/.github/actions/stage2-setup/action.yml @@ -120,7 +120,7 @@ runs: platforms: all - uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0 with: - go-version: '1.25.6' + go-version: '1.26.0' - if: ${{ inputs.BINARY == 'podman' }} name: Set up Podman run: | diff --git a/Earthfile b/Earthfile index 1419a78b28..89490da972 100644 --- a/Earthfile +++ b/Earthfile @@ -23,7 +23,7 @@ RUN apk add --update --no-cache \ util-linux # install Golang # renovate: datasource=golang-version packageName=go -LET GO_VERSION=1.25.6 +LET GO_VERSION=1.26.0 ENV GOPATH=/go ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin ARG USERARCH @@ -156,7 +156,7 @@ earthly-script-no-stdout: # lint runs basic go linters against the earthly project. lint: # renovate: datasource=github-releases packageName=golangci/golangci-lint - LET golangci_lint_version=2.8.0 + LET golangci_lint_version=2.9.0 RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v$golangci_lint_version COPY ./.golangci.yaml . COPY --dir +code/earthly / diff --git a/config/config.go b/config/config.go index 4f5944df48..8606a69056 100644 --- a/config/config.go +++ b/config/config.go @@ -316,8 +316,7 @@ func validatePath(t reflect.Type, path []string) (reflect.Type, string, error) { return validatePath(t.Elem(), path[1:]) } - for i := range t.NumField() { - field := t.Field(i) + for field := range t.Fields() { yamlTag := field.Tag.Get("yaml") helpTag := field.Tag.Get("help") diff --git a/debugger/terminal/terminal_other.go b/debugger/terminal/terminal_other.go index 273d83dba0..fe605ba1e9 100644 --- a/debugger/terminal/terminal_other.go +++ b/debugger/terminal/terminal_other.go @@ -89,7 +89,7 @@ func ConnectTerm(ctx context.Context, conn io.ReadWriteCloser, console consloggi break outer } default: - console.VerbosePrintf("unhandled terminal data type: %q\n", connDataType) + console.VerbosePrintf("unhandled terminal data type: %d\n", connDataType) break outer } } diff --git a/examples/bazel/WORKSPACE b/examples/bazel/WORKSPACE index ea48385e70..e5deeff46b 100644 --- a/examples/bazel/WORKSPACE +++ b/examples/bazel/WORKSPACE @@ -2,8 +2,11 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "io_bazel_rules_docker", - sha256 = "b1e80761a8a8243d03ebca8845e9cc1ba6c82ce7c5179ce2b295cd36f7e394bf", - urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.25.0/rules_docker-v0.25.0.tar.gz"], + sha256 = "f6dcb97e992f13bc9effd794e9bb300f06b0dadc88061f81ae68d8d5994be964", + urls = [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_docker/releases/download/v0.26.0/rules_docker-v0.26.0.tar.gz", + "https://github.com/bazelbuild/rules_docker/releases/download/v0.26.0/rules_docker-v0.26.0.tar.gz", + ], ) load( diff --git a/go.mod b/go.mod index 048a3ab118..bcdd8251eb 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/EarthBuild/earthbuild -go 1.25 +go 1.26 require ( al.essio.dev/pkg/shellescape v1.6.0 diff --git a/util/oidcutil/aws.go b/util/oidcutil/aws.go index 46c8511893..7de0a86a29 100644 --- a/util/oidcutil/aws.go +++ b/util/oidcutil/aws.go @@ -28,15 +28,18 @@ var ( if input.Seconds() < 900 || input.Seconds() > 43200 { return errors.New("duration must be between 900s and 43200s") } + return nil }), stringToARN(func(input *arn.ARN) error { if input.Service != "iam" { return fmt.Errorf(`aws service ("%s") must be "iam"`, input.Service) } + if !strings.HasPrefix(input.Resource, "role/") { return fmt.Errorf(`resource ("%s") must be an aws role"`, input.Resource) } + return nil }), ),