From d7178d5e3a37409bf96c985e47c74071b6948e97 Mon Sep 17 00:00:00 2001 From: Miguel Martinez Date: Mon, 18 Aug 2025 11:33:22 +0200 Subject: [PATCH 1/2] chore: upgrade golang 1.25 Signed-off-by: Miguel Martinez --- .github/workflows/codeql.yml | 2 +- .github/workflows/lint.yml | 4 ++-- .github/workflows/release.yaml | 2 +- .github/workflows/test.yml | 2 +- CLAUDE.md | 2 +- app/artifact-cas/Dockerfile | 2 +- app/artifact-cas/Dockerfile.goreleaser | 2 +- app/cli/Dockerfile.goreleaser | 2 +- app/controlplane/Dockerfile | 2 +- app/controlplane/Dockerfile.goreleaser | 2 +- docs/examples/ci-workflows/github.yaml | 2 +- go.mod | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 1fa5804e5..2c3d425a2 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -48,7 +48,7 @@ jobs: - name: Set up Go uses: actions/setup-go@be3c94b385c4f180051c996d336f57a34c397495 # v3.6.1 with: - go-version: "1.24.6" + go-version: "1.25.0" # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4b42adcfc..500f38138 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -26,7 +26,7 @@ jobs: steps: - uses: actions/setup-go@be3c94b385c4f180051c996d336f57a34c397495 # v3.6.1 with: - go-version: "1.24.6" + go-version: "1.25.0" - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 @@ -67,7 +67,7 @@ jobs: - uses: actions/setup-go@be3c94b385c4f180051c996d336f57a34c397495 # v3.6.1 with: - go-version: "1.24.6" + go-version: "1.25.0" - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 22832a15b..528392814 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -78,7 +78,7 @@ jobs: - name: Set up Go uses: actions/setup-go@be3c94b385c4f180051c996d336f57a34c397495 # v3.6.1 with: - go-version: "1.24.6" + go-version: "1.25.0" # install qemu binaries for multiarch builds (needed by goreleaser/buildx) - name: Setup qemu diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5b1c874c0..de8f1166f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,7 +27,7 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - uses: actions/setup-go@be3c94b385c4f180051c996d336f57a34c397495 # v3.6.1 with: - go-version: "1.24.6" + go-version: "1.25.0" cache: true cache-dependency-path: go.sum diff --git a/CLAUDE.md b/CLAUDE.md index 417f07e67..6b8a6be64 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -135,7 +135,7 @@ make migration_lint # Lint migration files ## Key Technologies -- **Language**: Go 1.24.6. To know how to upgrade go version, see docs/runbooks +- **Language**: Go 1.25.0. To know how to upgrade go version, see docs/runbooks - **API**: gRPC with HTTP/JSON gateway, Protocol Buffers with buf - **Database**: PostgreSQL with Ent ORM, Atlas for migrations - **Authentication**: OIDC, JWT tokens diff --git a/app/artifact-cas/Dockerfile b/app/artifact-cas/Dockerfile index 0d6243a05..28b0a5076 100644 --- a/app/artifact-cas/Dockerfile +++ b/app/artifact-cas/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.6@sha256:2c89c41fb9efc3807029b59af69645867cfe978d2b877d475be0d72f6c6ce6f6 AS builder +FROM golang:1.25.0@sha256:9e56f0d0f043a68bb8c47c819e47dc29f6e8f5129b8885bed9d43f058f7f3ed6 AS builder # Not linked libraries since it will be injected into a scratch container ENV CGO_ENABLED=0 diff --git a/app/artifact-cas/Dockerfile.goreleaser b/app/artifact-cas/Dockerfile.goreleaser index 89dfcec3e..130bdc5ec 100644 --- a/app/artifact-cas/Dockerfile.goreleaser +++ b/app/artifact-cas/Dockerfile.goreleaser @@ -1,4 +1,4 @@ -FROM golang:1.24.6@sha256:2c89c41fb9efc3807029b59af69645867cfe978d2b877d475be0d72f6c6ce6f6 AS builder +FROM golang:1.25.0@sha256:9e56f0d0f043a68bb8c47c819e47dc29f6e8f5129b8885bed9d43f058f7f3ed6 AS builder FROM scratch diff --git a/app/cli/Dockerfile.goreleaser b/app/cli/Dockerfile.goreleaser index e7f0bbd11..1c0bc1de2 100644 --- a/app/cli/Dockerfile.goreleaser +++ b/app/cli/Dockerfile.goreleaser @@ -1,4 +1,4 @@ -FROM golang:1.24.6@sha256:2c89c41fb9efc3807029b59af69645867cfe978d2b877d475be0d72f6c6ce6f6 AS builder +FROM golang:1.25.0@sha256:9e56f0d0f043a68bb8c47c819e47dc29f6e8f5129b8885bed9d43f058f7f3ed6 AS builder RUN mkdir -p /.config/chainloop FROM scratch diff --git a/app/controlplane/Dockerfile b/app/controlplane/Dockerfile index 89dc1ab15..0e7667b15 100644 --- a/app/controlplane/Dockerfile +++ b/app/controlplane/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.6@sha256:2c89c41fb9efc3807029b59af69645867cfe978d2b877d475be0d72f6c6ce6f6 AS builder +FROM golang:1.25.0@sha256:9e56f0d0f043a68bb8c47c819e47dc29f6e8f5129b8885bed9d43f058f7f3ed6 AS builder # Not linked libraries since it will be injected into a scratch container ENV CGO_ENABLED=0 diff --git a/app/controlplane/Dockerfile.goreleaser b/app/controlplane/Dockerfile.goreleaser index 9d14c9c81..98f6fae1f 100644 --- a/app/controlplane/Dockerfile.goreleaser +++ b/app/controlplane/Dockerfile.goreleaser @@ -1,4 +1,4 @@ -FROM golang:1.24.6@sha256:2c89c41fb9efc3807029b59af69645867cfe978d2b877d475be0d72f6c6ce6f6 AS builder +FROM golang:1.25.0@sha256:9e56f0d0f043a68bb8c47c819e47dc29f6e8f5129b8885bed9d43f058f7f3ed6 AS builder FROM scratch diff --git a/docs/examples/ci-workflows/github.yaml b/docs/examples/ci-workflows/github.yaml index 7343231ed..9968b51b7 100644 --- a/docs/examples/ci-workflows/github.yaml +++ b/docs/examples/ci-workflows/github.yaml @@ -41,7 +41,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: "1.24.6" + go-version: "1.25.0" # Generate SBOM using syft in cycloneDX format - uses: anchore/sbom-action@v0 diff --git a/go.mod b/go.mod index a6d566222..b2c0f4af1 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/chainloop-dev/chainloop -go 1.24.6 +go 1.25.0 require ( cloud.google.com/go/secretmanager v1.14.2 From 7607299d62edc2328fdaf4a15e5b452c2b35e3c7 Mon Sep 17 00:00:00 2001 From: Miguel Martinez Date: Mon, 18 Aug 2025 11:38:49 +0200 Subject: [PATCH 2/2] fix linter Signed-off-by: Miguel Martinez --- .github/workflows/lint.yml | 6 +++--- common.mk | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 500f38138..4a89d38c5 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -34,7 +34,7 @@ jobs: uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # 7.0.0 if: ${{ matrix.app == 'main-module' }} with: - version: v2.0.2 + version: v2.4.0 only-new-issues: 'true' - name: Lint ${{ matrix.app }} @@ -42,7 +42,7 @@ jobs: if: ${{ matrix.app != 'main-module' }} with: working-directory: app/${{ matrix.app }} - version: v2.0.2 + version: v2.4.0 only-new-issues: 'true' lint-protos: @@ -79,5 +79,5 @@ jobs: uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # 7.0.0 with: working-directory: extras/dagger - version: v2.0.2 + version: v2.4.0 only-new-issues: 'true' diff --git a/common.mk b/common.mk index 53ac388a7..08fee8e4d 100644 --- a/common.mk +++ b/common.mk @@ -8,6 +8,8 @@ init: init-api-tools # using binary release for atlas, since ent schema handler is not included # in the community version anymore https://github.com/ariga/atlas/issues/2388#issuecomment-1864287189 curl -sSf https://atlasgo.sh | ATLAS_VERSION=v0.35.0 sh -s -- -y + # install golangci-lint with Go 1.25 support + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v2.4.0 # initialize API tooling .PHONY: init-api-tools