diff --git a/.citools/src/cog/go.mod b/.citools/src/cog/go.mod index bc4ada48c721..0c52c5bddc5e 100644 --- a/.citools/src/cog/go.mod +++ b/.citools/src/cog/go.mod @@ -1,6 +1,6 @@ module cog -go 1.25.3 +go 1.25.7 tool github.com/grafana/cog/cmd/cli diff --git a/.tekton/glo-grafana-globalhub-1-7-pull-request.yaml b/.tekton/glo-grafana-globalhub-1-7-pull-request.yaml index eed7e55163c7..d52aea5aa0dc 100644 --- a/.tekton/glo-grafana-globalhub-1-7-pull-request.yaml +++ b/.tekton/glo-grafana-globalhub-1-7-pull-request.yaml @@ -56,7 +56,7 @@ spec: - name: revision value: main - name: pathInRepo - value: pipelines/common.yaml + value: pipelines/common-base.yaml taskRunTemplate: serviceAccountName: build-pipeline-glo-grafana-globalhub-1-7 workspaces: diff --git a/.tekton/glo-grafana-globalhub-1-7-push.yaml b/.tekton/glo-grafana-globalhub-1-7-push.yaml index 41552df1b66e..e15d8dcb4d4e 100644 --- a/.tekton/glo-grafana-globalhub-1-7-push.yaml +++ b/.tekton/glo-grafana-globalhub-1-7-push.yaml @@ -67,7 +67,7 @@ spec: - name: revision value: main - name: pathInRepo - value: pipelines/common.yaml + value: pipelines/common-base.yaml taskRunTemplate: serviceAccountName: build-pipeline-glo-grafana-globalhub-1-7 workspaces: diff --git a/go.mod b/go.mod index 3181a7fc2955..3ea2a6322640 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana -go 1.25.3 +go 1.25.7 // Override containerd to fix CVE-2024-25621 (local privilege escalation) replace github.com/containerd/containerd => github.com/containerd/containerd v1.7.29 diff --git a/go.work b/go.work index 91586b99fbf2..888003dee765 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.25.3 +go 1.25.7 // The `skip:golangci-lint` comment tag is used to exclude the package from the `golangci-lint` GitHub Action. // The module at the root of the repo (`.`) is excluded because ./pkg/... is included manually in the `golangci-lint` configuration. diff --git a/pkg/codegen/go.mod b/pkg/codegen/go.mod index 79e7f65097a7..30ed285de401 100644 --- a/pkg/codegen/go.mod +++ b/pkg/codegen/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/codegen -go 1.25.3 +go 1.25.7 require ( cuelang.org/go v0.11.1 diff --git a/pkg/plugins/codegen/go.mod b/pkg/plugins/codegen/go.mod index ce6aae239d18..ffd3631b48b8 100644 --- a/pkg/plugins/codegen/go.mod +++ b/pkg/plugins/codegen/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/plugins/codegen -go 1.25.3 +go 1.25.7 replace github.com/grafana/grafana/pkg/codegen => ../../codegen