diff --git a/.github/release-workflows.jsonnet b/.github/release-workflows.jsonnet index 0713fb66857e9..1086752945cc3 100644 --- a/.github/release-workflows.jsonnet +++ b/.github/release-workflows.jsonnet @@ -59,6 +59,9 @@ local weeklyImageJobs = { versioningStrategy='always-bump-patch', ) + { name: 'Prepare Patch Release PR', + env+: { + GO_VERSION: goVersion, + }, }, false, false ), 'minor-release-pr.yml': std.manifestYamlDoc( @@ -79,6 +82,9 @@ local weeklyImageJobs = { versioningStrategy='always-bump-minor', ) + { name: 'Prepare Minor Release PR from Weekly', + env+: { + GO_VERSION: goVersion, + }, }, false, false ), 'release.yml': std.manifestYamlDoc( @@ -91,7 +97,11 @@ local weeklyImageJobs = { releaseBranchTemplate='release-\\${major}.\\${minor}.x', releaseRepo='grafana/loki', useGitHubAppToken=true, - ), false, false + ) + { + env+: { + GO_VERSION: goVersion, + }, + }, false, false ), 'check.yml': std.manifestYamlDoc({ name: 'check', diff --git a/.github/workflows/minor-release-pr.yml b/.github/workflows/minor-release-pr.yml index 4a2dc94c3a1c5..6e701f2325ea2 100644 --- a/.github/workflows/minor-release-pr.yml +++ b/.github/workflows/minor-release-pr.yml @@ -7,6 +7,7 @@ env: DOCKER_USERNAME: "grafana" DRY_RUN: false GITHUB_APP: "loki-gh-app" + GO_VERSION: "1.25.4" IMAGE_PREFIX: "grafana" RELEASE_LIB_REF: "dfe753760ce6ec2f4549fc11d2df24a2aa584e3f" RELEASE_REPO: "grafana/loki" diff --git a/.github/workflows/patch-release-pr.yml b/.github/workflows/patch-release-pr.yml index c30f3f472cda4..c826f0806e720 100644 --- a/.github/workflows/patch-release-pr.yml +++ b/.github/workflows/patch-release-pr.yml @@ -7,6 +7,7 @@ env: DOCKER_USERNAME: "grafana" DRY_RUN: false GITHUB_APP: "loki-gh-app" + GO_VERSION: "1.25.4" IMAGE_PREFIX: "grafana" RELEASE_LIB_REF: "dfe753760ce6ec2f4549fc11d2df24a2aa584e3f" RELEASE_REPO: "grafana/loki" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f1b97464facf6..de93e330cf46b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,6 +3,7 @@ concurrency: env: BUILD_ARTIFACTS_BUCKET: "loki-build-artifacts" GITHUB_APP: "loki-gh-app" + GO_VERSION: "1.25.4" IMAGE_PREFIX: "grafana" PUBLISH_TO_GCS: false RELEASE_LIB_REF: "dfe753760ce6ec2f4549fc11d2df24a2aa584e3f" diff --git a/loki-build-image/Dockerfile b/loki-build-image/Dockerfile index a6f36a23b912f..bc470602dd3f2 100644 --- a/loki-build-image/Dockerfile +++ b/loki-build-image/Dockerfile @@ -4,7 +4,7 @@ # tag of the Docker image in `../.drone/drone.jsonnet` and run `make drone`. # See ../docs/sources/community/maintaining/release-loki-build-image.md for instructions # on how to publish a new build image. -ARG GO_VERSION=1.25 +ARG GO_VERSION=1.25.4 ARG GOLANG_BASE_IMAGE=golang:${GO_VERSION}-trixie # Install helm (https://helm.sh/) and helm-docs (https://github.com/norwoodj/helm-docs) for generating Helm Chart reference.