Skip to content

Commit 3025090

Browse files
paul1rpaul1r
authored
chore(build): Update to Go 1.24 (#16527)
1 parent 2b99806 commit 3025090

File tree

9 files changed

+28
-24
lines changed

9 files changed

+28
-24
lines changed

‎.github/release-workflows.jsonnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ local checkTemplate = 'grafana/loki-release/.github/workflows/check.yml@%s' % re
77
local buildImageVersion = std.extVar('BUILD_IMAGE_VERSION');
88
local goVersion = std.extVar('GO_VERSION');
99
local buildImage = 'grafana/loki-build-image:%s' % buildImageVersion;
10-
local golangCiLintVersion = 'v1.60.3';
10+
local golangCiLintVersion = 'v1.64.5';
1111
local imageBuildTimeoutMin = 60;
1212
local imagePrefix = 'grafana';
1313
local dockerPluginDir = 'clients/cmd/docker-driver';

‎.github/workflows/check.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"check":
33
"uses": "grafana/loki-release/.github/workflows/check.yml@main"
44
"with":
5-
"build_image": "grafana/loki-build-image:0.34.5"
6-
"golang_ci_lint_version": "v1.60.3"
5+
"build_image": "grafana/loki-build-image:0.34.6"
6+
"golang_ci_lint_version": "v1.64.5"
77
"release_lib_ref": "main"
88
"skip_validation": false
99
"use_github_app_token": true

‎.github/workflows/images.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
"check":
33
"uses": "grafana/loki-release/.github/workflows/check.yml@main"
44
"with":
5-
"build_image": "grafana/loki-build-image:0.34.5"
6-
"golang_ci_lint_version": "v1.60.3"
5+
"build_image": "grafana/loki-build-image:0.34.6"
6+
"golang_ci_lint_version": "v1.64.5"
77
"release_lib_ref": "main"
88
"skip_validation": false
99
"use_github_app_token": true
1010
"lambda-promtail-image":
1111
"env":
1212
"BUILD_TIMEOUT": 60
13-
"GO_VERSION": "1.23.6"
13+
"GO_VERSION": "1.24.1"
1414
"IMAGE_PREFIX": "public.ecr.aws/grafana"
1515
"RELEASE_LIB_REF": "main"
1616
"RELEASE_REPO": "grafana/loki"
@@ -98,7 +98,7 @@
9898
"loki-canary-boringcrypto-image":
9999
"env":
100100
"BUILD_TIMEOUT": 60
101-
"GO_VERSION": "1.23.6"
101+
"GO_VERSION": "1.24.1"
102102
"IMAGE_PREFIX": "grafana"
103103
"RELEASE_LIB_REF": "main"
104104
"RELEASE_REPO": "grafana/loki"
@@ -206,7 +206,7 @@
206206
"loki-canary-image":
207207
"env":
208208
"BUILD_TIMEOUT": 60
209-
"GO_VERSION": "1.23.6"
209+
"GO_VERSION": "1.24.1"
210210
"IMAGE_PREFIX": "grafana"
211211
"RELEASE_LIB_REF": "main"
212212
"RELEASE_REPO": "grafana/loki"
@@ -314,7 +314,7 @@
314314
"loki-image":
315315
"env":
316316
"BUILD_TIMEOUT": 60
317-
"GO_VERSION": "1.23.6"
317+
"GO_VERSION": "1.24.1"
318318
"IMAGE_PREFIX": "grafana"
319319
"RELEASE_LIB_REF": "main"
320320
"RELEASE_REPO": "grafana/loki"
@@ -422,7 +422,7 @@
422422
"promtail-image":
423423
"env":
424424
"BUILD_TIMEOUT": 60
425-
"GO_VERSION": "1.23.6"
425+
"GO_VERSION": "1.24.1"
426426
"IMAGE_PREFIX": "grafana"
427427
"RELEASE_LIB_REF": "main"
428428
"RELEASE_REPO": "grafana/loki"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
check:
1717
uses: "grafana/loki-release/.github/workflows/check.yml@main"
1818
with:
19-
build_image: "grafana/loki-build-image:0.34.5"
20-
golang_ci_lint_version: "v1.60.3"
19+
build_image: "grafana/loki-build-image:0.34.6"
20+
golang_ci_lint_version: "v1.64.5"
2121
release_lib_ref: "main"
2222
skip_validation: false
2323
use_github_app_token: true
@@ -144,7 +144,7 @@ jobs:
144144
--env SKIP_ARM \
145145
--volume .:/src/loki \
146146
--workdir /src/loki \
147-
--entrypoint /bin/sh "grafana/loki-build-image:0.34.5"
147+
--entrypoint /bin/sh "grafana/loki-build-image:0.34.6"
148148
git config --global --add safe.directory /src/loki
149149
echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
150150
make dist packages
@@ -666,7 +666,7 @@ jobs:
666666
build-args: |
667667
IMAGE_TAG=${{ needs.version.outputs.version }}
668668
GOARCH=${{ steps.platform.outputs.platform_short }}
669-
BUILD_IMAGE=grafana/loki-build-image:0.34.5
669+
BUILD_IMAGE=grafana/loki-build-image:0.34.6
670670
context: "release"
671671
file: "release/clients/cmd/docker-driver/Dockerfile"
672672
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
@@ -16,8 +16,8 @@ jobs:
1616
check:
1717
uses: "grafana/loki-release/.github/workflows/check.yml@main"
1818
with:
19-
build_image: "grafana/loki-build-image:0.34.5"
20-
golang_ci_lint_version: "v1.60.3"
19+
build_image: "grafana/loki-build-image:0.34.6"
20+
golang_ci_lint_version: "v1.64.5"
2121
release_lib_ref: "main"
2222
skip_validation: false
2323
use_github_app_token: true
@@ -144,7 +144,7 @@ jobs:
144144
--env SKIP_ARM \
145145
--volume .:/src/loki \
146146
--workdir /src/loki \
147-
--entrypoint /bin/sh "grafana/loki-build-image:0.34.5"
147+
--entrypoint /bin/sh "grafana/loki-build-image:0.34.6"
148148
git config --global --add safe.directory /src/loki
149149
echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
150150
make dist packages
@@ -666,7 +666,7 @@ jobs:
666666
build-args: |
667667
IMAGE_TAG=${{ needs.version.outputs.version }}
668668
GOARCH=${{ steps.platform.outputs.platform_short }}
669-
BUILD_IMAGE=grafana/loki-build-image:0.34.5
669+
BUILD_IMAGE=grafana/loki-build-image:0.34.6
670670
context: "release"
671671
file: "release/clients/cmd/docker-driver/Dockerfile"
672672
outputs: "type=local,dest=release/plugins/loki-docker-driver-${{ needs.version.outputs.version}}-${{ steps.platform.outputs.platform }}"

‎.github/workflows/promtail-windows-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: windows-latest
1111
strategy:
1212
matrix:
13-
go-version: [ '1.22.2', '1.23.1' ]
13+
go-version: [ '1.22.12', '1.23.6', '1.24.0' ]
1414
steps:
1515
- uses: actions/checkout@v4
1616
- name: Setup Go ${{ matrix.go-version }}

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ BUILD_IN_CONTAINER ?= true
1818
CI ?= false
1919

2020
# Ensure you run `make release-workflows` after changing this
21-
GO_VERSION := 1.23.6
21+
GO_VERSION := 1.24.1
2222
# Ensure you run `make IMAGE_TAG=<updated-tag> build-image-push` after changing this
23-
BUILD_IMAGE_TAG := 0.34.5
23+
BUILD_IMAGE_TAG := 0.34.6
2424

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

‎loki-build-image/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ RUN apk add --no-cache curl && \
2929
FROM alpine:3.21.3 AS golangci
3030
RUN apk add --no-cache curl && \
3131
cd / && \
32-
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.60.3
32+
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.64.5
3333

3434
FROM alpine:3.21.3 AS buf
3535
ARG TARGETOS
@@ -51,8 +51,8 @@ RUN curl -L "https://github.com/drone/drone-cli/releases/download/v1.7.0/drone_l
5151
# github.com/fatih/[email protected] requires golang.org/x/[email protected]
5252
# (not golang.org/x/[email protected] from golang.org/x/tools/cmd/goyacc@58d531046acdc757f177387bc1725bfa79895d69)
5353
FROM ${GOLANG_BASE_IMAGE} AS faillint
54-
RUN GO111MODULE=on go install github.com/fatih/faillint@v1.12.0
55-
RUN GO111MODULE=on go install golang.org/x/tools/cmd/goimports@v0.7.0
54+
RUN GO111MODULE=on go install github.com/fatih/faillint@v1.15.0
55+
RUN GO111MODULE=on go install golang.org/x/tools/cmd/goimports@v0.30.0
5656

5757
FROM ${GOLANG_BASE_IMAGE} AS delve
5858
RUN GO111MODULE=on go install github.com/go-delve/delve/cmd/dlv@latest

‎loki-build-image/README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Versions
44

5+
### 0.34.6
6+
7+
- Update to Go 1.24.1
8+
59
### 0.34.5
610

711
- Update to Go 1.23.6

0 commit comments

Comments
 (0)