Skip to content

Commit 0baa6a7

Browse files
authored
chore: Update Golang in CI and build env to 1.23.6 (#16098)
Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
1 parent 1187a73 commit 0baa6a7

File tree

7 files changed

+20
-15
lines changed

7 files changed

+20
-15
lines changed

‎.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@main"
44
"with":
5-
"build_image": "grafana/loki-build-image:0.34.4"
5+
"build_image": "grafana/loki-build-image:0.34.5"
66
"golang_ci_lint_version": "v1.60.3"
77
"release_lib_ref": "main"
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@main"
44
"with":
5-
"build_image": "grafana/loki-build-image:0.34.4"
5+
"build_image": "grafana/loki-build-image:0.34.5"
66
"golang_ci_lint_version": "v1.60.3"
77
"release_lib_ref": "main"
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.23.5"
13+
"GO_VERSION": "1.23.6"
1414
"IMAGE_PREFIX": "grafana"
1515
"RELEASE_LIB_REF": "main"
1616
"RELEASE_REPO": "grafana/loki"
@@ -118,7 +118,7 @@
118118
"loki-canary-image":
119119
"env":
120120
"BUILD_TIMEOUT": 60
121-
"GO_VERSION": "1.23.5"
121+
"GO_VERSION": "1.23.6"
122122
"IMAGE_PREFIX": "grafana"
123123
"RELEASE_LIB_REF": "main"
124124
"RELEASE_REPO": "grafana/loki"
@@ -226,7 +226,7 @@
226226
"loki-image":
227227
"env":
228228
"BUILD_TIMEOUT": 60
229-
"GO_VERSION": "1.23.5"
229+
"GO_VERSION": "1.23.6"
230230
"IMAGE_PREFIX": "grafana"
231231
"RELEASE_LIB_REF": "main"
232232
"RELEASE_REPO": "grafana/loki"
@@ -334,7 +334,7 @@
334334
"promtail-image":
335335
"env":
336336
"BUILD_TIMEOUT": 60
337-
"GO_VERSION": "1.23.5"
337+
"GO_VERSION": "1.23.6"
338338
"IMAGE_PREFIX": "grafana"
339339
"RELEASE_LIB_REF": "main"
340340
"RELEASE_REPO": "grafana/loki"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
check:
1717
uses: "grafana/loki-release/.github/workflows/check.yml@main"
1818
with:
19-
build_image: "grafana/loki-build-image:0.34.4"
19+
build_image: "grafana/loki-build-image:0.34.5"
2020
golang_ci_lint_version: "v1.60.3"
2121
release_lib_ref: "main"
2222
skip_validation: false
@@ -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.4"
147+
--entrypoint /bin/sh "grafana/loki-build-image:0.34.5"
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.4
669+
BUILD_IMAGE=grafana/loki-build-image:0.34.5
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
check:
1717
uses: "grafana/loki-release/.github/workflows/check.yml@main"
1818
with:
19-
build_image: "grafana/loki-build-image:0.34.4"
19+
build_image: "grafana/loki-build-image:0.34.5"
2020
golang_ci_lint_version: "v1.60.3"
2121
release_lib_ref: "main"
2222
skip_validation: false
@@ -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.4"
147+
--entrypoint /bin/sh "grafana/loki-build-image:0.34.5"
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.4
669+
BUILD_IMAGE=grafana/loki-build-image:0.34.5
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 }}"

‎Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +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.5
22-
BUILD_IMAGE_TAG := 0.34.4
21+
GO_VERSION := 1.23.6
22+
# Ensure you run `make IMAGE_TAG=<updated-tag> build-image-push` after changing this
23+
BUILD_IMAGE_TAG := 0.34.5
2324

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

‎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.5
6+
7+
- Update to Go 1.23.6
8+
59
### 0.34.4
610

711
- Update to Go 1.23.5

‎tools/lambda-promtail/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22-alpine AS build-image
1+
FROM golang:1.23-alpine AS build-image
22

33
COPY tools/lambda-promtail /src/lambda-promtail
44
WORKDIR /src/lambda-promtail

0 commit comments

Comments
 (0)