Skip to content

Commit 2c8fff2

Browse files
DylanGuedesDylanGuedes
authored
fix: Upgrade Go and gRPC versions on 3.7.x (#21282)
1 parent 394688b commit 2c8fff2

25 files changed

Lines changed: 113 additions & 66 deletions

File tree

‎.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.35.0",
2+
"image": "grafana/loki-build-image:0.35.1",
33
"containerEnv": {
44
"BUILD_IN_CONTAINER": "false"
55
},

‎.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 = 'v2.10.1';
10+
local golangCiLintVersion = 'v2.11.4';
1111
local imageBuildTimeoutMin = 60;
1212
local imagePrefix = 'grafana';
1313
local dockerPluginDir = 'clients/cmd/docker-driver';

‎.github/workflows/build-loki-binary.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions:
99
contents: read
1010

1111
env:
12-
GO_VERSION: "1.26.0"
12+
GO_VERSION: "1.26.1"
1313

1414
jobs:
1515
build:

‎.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@fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
44
"with":
5-
"build_image": "grafana/loki-build-image:0.35.0"
6-
"golang_ci_lint_version": "v2.10.1"
5+
"build_image": "grafana/loki-build-image:0.35.1"
6+
"golang_ci_lint_version": "v2.11.4"
77
"release_lib_ref": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
88
"skip_validation": false
99
"use_github_app_token": true

‎.github/workflows/images.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
"check":
33
"uses": "grafana/loki-release/.github/workflows/check.yml@fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
44
"with":
5-
"build_image": "grafana/loki-build-image:0.35.0"
6-
"golang_ci_lint_version": "v2.10.1"
5+
"build_image": "grafana/loki-build-image:0.35.1"
6+
"golang_ci_lint_version": "v2.11.4"
77
"release_lib_ref": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
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.26.0"
13+
"GO_VERSION": "1.26.1"
1414
"IMAGE_PREFIX": "grafana"
1515
"RELEASE_LIB_REF": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
1616
"RELEASE_REPO": "grafana/loki"
@@ -134,7 +134,7 @@
134134
"loki-canary-image":
135135
"env":
136136
"BUILD_TIMEOUT": 60
137-
"GO_VERSION": "1.26.0"
137+
"GO_VERSION": "1.26.1"
138138
"IMAGE_PREFIX": "grafana"
139139
"RELEASE_LIB_REF": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
140140
"RELEASE_REPO": "grafana/loki"
@@ -258,7 +258,7 @@
258258
"loki-image":
259259
"env":
260260
"BUILD_TIMEOUT": 60
261-
"GO_VERSION": "1.26.0"
261+
"GO_VERSION": "1.26.1"
262262
"IMAGE_PREFIX": "grafana"
263263
"RELEASE_LIB_REF": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
264264
"RELEASE_REPO": "grafana/loki"
@@ -382,7 +382,7 @@
382382
"querytee-image":
383383
"env":
384384
"BUILD_TIMEOUT": 60
385-
"GO_VERSION": "1.26.0"
385+
"GO_VERSION": "1.26.1"
386386
"IMAGE_PREFIX": "grafana"
387387
"RELEASE_LIB_REF": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
388388
"RELEASE_REPO": "grafana/loki"

‎.github/workflows/logql-correctness.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
- name: Setup Go
5050
uses: actions/setup-go@v4
5151
with:
52-
go-version: "1.26.0"
52+
go-version: "1.26.1"
5353

5454
# The metastore generates invalid filenames for Windows (with colons),
5555
# which get rejected by upload-artifact. We zip these files to avoid this
@@ -96,7 +96,7 @@ jobs:
9696
- name: Setup Go
9797
uses: actions/setup-go@v4
9898
with:
99-
go-version: "1.26.0"
99+
go-version: "1.26.1"
100100

101101
- name: Create results directory
102102
run: mkdir -p ./pkg/logql/bench/results

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
pull-requests: "write"
2222
uses: "grafana/loki-release/.github/workflows/check.yml@fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
2323
with:
24-
build_image: "grafana/loki-build-image:0.35.0"
25-
golang_ci_lint_version: "v2.10.1"
24+
build_image: "grafana/loki-build-image:0.35.1"
25+
golang_ci_lint_version: "v2.11.4"
2626
release_lib_ref: "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
2727
skip_validation: false
2828
use_github_app_token: true
@@ -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.35.0"
182+
--entrypoint /bin/sh "grafana/loki-build-image:0.35.1"
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.35.0" | grep -q "golang"; then
185+
if echo "grafana/loki-build-image:0.35.1" | 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.35.0
801+
BUILD_IMAGE=grafana/loki-build-image:0.35.1
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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
pull-requests: "write"
2222
uses: "grafana/loki-release/.github/workflows/check.yml@fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
2323
with:
24-
build_image: "grafana/loki-build-image:0.35.0"
25-
golang_ci_lint_version: "v2.10.1"
24+
build_image: "grafana/loki-build-image:0.35.1"
25+
golang_ci_lint_version: "v2.11.4"
2626
release_lib_ref: "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
2727
skip_validation: false
2828
use_github_app_token: true
@@ -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.35.0"
182+
--entrypoint /bin/sh "grafana/loki-build-image:0.35.1"
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.35.0" | grep -q "golang"; then
185+
if echo "grafana/loki-build-image:0.35.1" | 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.35.0
801+
BUILD_IMAGE=grafana/loki-build-image:0.35.1
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/querytee-images.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ permissions:
1717
env:
1818
BUILD_TIMEOUT: 60
1919
IMAGE_PREFIX: grafana
20-
GO_VERSION: "1.26.0"
20+
GO_VERSION: "1.26.1"
2121

2222
jobs:
2323
loki-query-tee-image:

‎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.26.0
29+
GO_VERSION := 1.26.1
3030
# Ensure you run `make IMAGE_TAG=<updated-tag> build-image-push` after changing this
31-
BUILD_IMAGE_TAG := 0.35.0
31+
BUILD_IMAGE_TAG := 0.35.1
3232

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

0 commit comments

Comments
 (0)