Skip to content

Commit 9385bc6

Browse files
salvacortssalvacorts
authored
chore: upgrade to Go 1.25 (#20204)
1 parent 2380e63 commit 9385bc6

File tree

13 files changed

+29
-29
lines changed

13 files changed

+29
-29
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"image": "grafana/loki-build-image:0.34.6",
2+
"image": "grafana/loki-build-image:0.34.8",
33
"containerEnv": {
44
"BUILD_IN_CONTAINER": "false"
55
},

‎.github/workflows/check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"check":
33
"uses": "grafana/loki-release/.github/workflows/check.yml@dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
44
"with":
5-
"build_image": "grafana/loki-build-image:0.34.7.1"
5+
"build_image": "grafana/loki-build-image:0.34.8"
66
"golang_ci_lint_version": "v2.5.0"
77
"release_lib_ref": "dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
88
"skip_validation": false

‎.github/workflows/images.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
"check":
33
"uses": "grafana/loki-release/.github/workflows/check.yml@dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
44
"with":
5-
"build_image": "grafana/loki-build-image:0.34.7.1"
5+
"build_image": "grafana/loki-build-image:0.34.8"
66
"golang_ci_lint_version": "v2.5.0"
77
"release_lib_ref": "dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
88
"skip_validation": false
99
"use_github_app_token": true
1010
"loki-canary-boringcrypto-image":
1111
"env":
1212
"BUILD_TIMEOUT": 60
13-
"GO_VERSION": "1.24"
13+
"GO_VERSION": "1.25"
1414
"IMAGE_PREFIX": "grafana"
1515
"RELEASE_LIB_REF": "dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
1616
"RELEASE_REPO": "grafana/loki"
@@ -134,7 +134,7 @@
134134
"loki-canary-image":
135135
"env":
136136
"BUILD_TIMEOUT": 60
137-
"GO_VERSION": "1.24"
137+
"GO_VERSION": "1.25"
138138
"IMAGE_PREFIX": "grafana"
139139
"RELEASE_LIB_REF": "dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
140140
"RELEASE_REPO": "grafana/loki"
@@ -258,7 +258,7 @@
258258
"loki-image":
259259
"env":
260260
"BUILD_TIMEOUT": 60
261-
"GO_VERSION": "1.24"
261+
"GO_VERSION": "1.25"
262262
"IMAGE_PREFIX": "grafana"
263263
"RELEASE_LIB_REF": "dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
264264
"RELEASE_REPO": "grafana/loki"
@@ -382,7 +382,7 @@
382382
"promtail-image":
383383
"env":
384384
"BUILD_TIMEOUT": 60
385-
"GO_VERSION": "1.24"
385+
"GO_VERSION": "1.25"
386386
"IMAGE_PREFIX": "grafana"
387387
"RELEASE_LIB_REF": "dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
388388
"RELEASE_REPO": "grafana/loki"

‎.github/workflows/minor-release-pr.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
pull-requests: "write"
2222
uses: "grafana/loki-release/.github/workflows/check.yml@dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
2323
with:
24-
build_image: "grafana/loki-build-image:0.34.7.1"
24+
build_image: "grafana/loki-build-image:0.34.8"
2525
golang_ci_lint_version: "v2.5.0"
2626
release_lib_ref: "dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
2727
skip_validation: false
@@ -179,10 +179,10 @@ jobs:
179179
--env SKIP_ARM \
180180
--volume .:/src/loki \
181181
--workdir /src/loki \
182-
--entrypoint /bin/sh "grafana/loki-build-image:0.34.7.1"
182+
--entrypoint /bin/sh "grafana/loki-build-image:0.34.8"
183183
git config --global --add safe.directory /src/loki
184184
echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
185-
if echo "grafana/loki-build-image:0.34.7.1" | grep -q "golang"; then
185+
if echo "grafana/loki-build-image:0.34.8" | grep -q "golang"; then
186186
/src/loki/.github/vendor/github.com/grafana/loki-release/workflows/install_workflow_dependencies.sh dist
187187
fi
188188
make dist packages
@@ -798,7 +798,7 @@ jobs:
798798
build-args: |
799799
IMAGE_TAG=${{ needs.version.outputs.version }}
800800
GOARCH=${{ steps.platform.outputs.platform_short }}
801-
BUILD_IMAGE=grafana/loki-build-image:0.34.7.1
801+
BUILD_IMAGE=grafana/loki-build-image:0.34.8
802802
context: "release"
803803
file: "release/clients/cmd/docker-driver/Dockerfile"
804804
outputs: "type=local,dest=release/plugins/loki-docker-driver-${{ needs.version.outputs.version}}-${{ steps.platform.outputs.platform }}"

‎.github/workflows/patch-release-pr.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
pull-requests: "write"
2222
uses: "grafana/loki-release/.github/workflows/check.yml@dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
2323
with:
24-
build_image: "grafana/loki-build-image:0.34.7.1"
24+
build_image: "grafana/loki-build-image:0.34.8"
2525
golang_ci_lint_version: "v2.5.0"
2626
release_lib_ref: "dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
2727
skip_validation: false
@@ -179,10 +179,10 @@ jobs:
179179
--env SKIP_ARM \
180180
--volume .:/src/loki \
181181
--workdir /src/loki \
182-
--entrypoint /bin/sh "grafana/loki-build-image:0.34.7.1"
182+
--entrypoint /bin/sh "grafana/loki-build-image:0.34.8"
183183
git config --global --add safe.directory /src/loki
184184
echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
185-
if echo "grafana/loki-build-image:0.34.7.1" | grep -q "golang"; then
185+
if echo "grafana/loki-build-image:0.34.8" | grep -q "golang"; then
186186
/src/loki/.github/vendor/github.com/grafana/loki-release/workflows/install_workflow_dependencies.sh dist
187187
fi
188188
make dist packages
@@ -798,7 +798,7 @@ jobs:
798798
build-args: |
799799
IMAGE_TAG=${{ needs.version.outputs.version }}
800800
GOARCH=${{ steps.platform.outputs.platform_short }}
801-
BUILD_IMAGE=grafana/loki-build-image:0.34.7.1
801+
BUILD_IMAGE=grafana/loki-build-image:0.34.8
802802
context: "release"
803803
file: "release/clients/cmd/docker-driver/Dockerfile"
804804
outputs: "type=local,dest=release/plugins/loki-docker-driver-${{ needs.version.outputs.version}}-${{ steps.platform.outputs.platform }}"

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ DOCKER_INTERACTIVE_FLAGS := --tty --interactive
2626
endif
2727

2828
# Ensure you run `make release-workflows` after changing this
29-
GO_VERSION := 1.24
29+
GO_VERSION := 1.25
3030
# Ensure you run `make IMAGE_TAG=<updated-tag> build-image-push` after changing this
31-
BUILD_IMAGE_TAG := 0.34.7.1
31+
BUILD_IMAGE_TAG := 0.34.8
3232

3333
IMAGE_TAG ?= $(shell ./tools/image-tag)
3434
GIT_REVISION := $(shell git rev-parse --short HEAD)

‎clients/cmd/docker-driver/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BUILD_IMAGE=grafana/loki-build-image:0.34.7
1+
ARG BUILD_IMAGE=grafana/loki-build-image:0.34.8
22
ARG GOARCH=amd64
33
# Directories in this file are referenced from the root of the project not this folder
44
# This file is intended to be called from the root like so:

‎clients/cmd/promtail/Dockerfile.cross‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG BUILD_IMAGE=grafana/loki-build-image:0.34.6
2-
ARG GO_VERSION=1.24
1+
ARG BUILD_IMAGE=grafana/loki-build-image:0.34.8
2+
ARG GO_VERSION=1.25
33
# Directories in this file are referenced from the root of the project not this folder
44
# This file is intended to be called from the root like so:
55
# docker build -t grafana/promtail -f clients/cmd/promtail/Dockerfile .

‎clients/cmd/promtail/Dockerfile.debug‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is intended to be called from the root like so:
33
# docker build -t grafana/promtail -f clients/cmd/promtail/Dockerfile.debug .
44

5-
FROM grafana/loki-build-image:0.34.6 AS build
5+
FROM grafana/loki-build-image:0.34.8 AS build
66
ARG GOARCH="amd64"
77
COPY . /src/loki
88
WORKDIR /src/loki

‎cmd/loki-canary/Dockerfile.cross‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG BUILD_IMAGE=grafana/loki-build-image:0.34.0
2-
ARG GO_VERSION=1.24
1+
ARG BUILD_IMAGE=grafana/loki-build-image:0.34.8
2+
ARG GO_VERSION=1.25
33
# Directories in this file are referenced from the root of the project not this folder
44
# This file is intended to be called from the root like so:
55
# docker build -t grafana/promtail -f cmd/promtail/Dockerfile .

0 commit comments

Comments
 (0)