From 6098466cea80a931368f9958f24dfbe18c0c80ce Mon Sep 17 00:00:00 2001 From: "loki-gh-app[bot]" <160051081+loki-gh-app[bot]@users.noreply.github.com> Date: Wed, 5 Feb 2025 10:48:29 +0100 Subject: [PATCH] chore: Update Golang in CI and build env to 1.23.6 (backport k239) (#16101) Co-authored-by: Christian Haudum --- .github/workflows/check.yml | 2 +- .github/workflows/images.yml | 10 +++++----- .github/workflows/minor-release-pr.yml | 6 +++--- .github/workflows/patch-release-pr.yml | 6 +++--- Makefile | 5 +++-- loki-build-image/README.md | 4 ++++ tools/lambda-promtail/Dockerfile | 2 +- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 4ae4ec778dc6a..dffe7a56b341a 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -2,7 +2,7 @@ "check": "uses": "grafana/loki-release/.github/workflows/check.yml@main" "with": - "build_image": "grafana/loki-build-image:0.34.4" + "build_image": "grafana/loki-build-image:0.34.5" "golang_ci_lint_version": "v1.60.3" "release_lib_ref": "main" "skip_validation": false diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml index 8ba365d6e9696..c0a0c3e8f16f8 100644 --- a/.github/workflows/images.yml +++ b/.github/workflows/images.yml @@ -2,7 +2,7 @@ "check": "uses": "grafana/loki-release/.github/workflows/check.yml@main" "with": - "build_image": "grafana/loki-build-image:0.34.4" + "build_image": "grafana/loki-build-image:0.34.5" "golang_ci_lint_version": "v1.60.3" "release_lib_ref": "main" "skip_validation": false @@ -10,7 +10,7 @@ "loki-canary-boringcrypto-image": "env": "BUILD_TIMEOUT": 60 - "GO_VERSION": "1.23.5" + "GO_VERSION": "1.23.6" "IMAGE_PREFIX": "grafana" "RELEASE_LIB_REF": "main" "RELEASE_REPO": "grafana/loki" @@ -118,7 +118,7 @@ "loki-canary-image": "env": "BUILD_TIMEOUT": 60 - "GO_VERSION": "1.23.5" + "GO_VERSION": "1.23.6" "IMAGE_PREFIX": "grafana" "RELEASE_LIB_REF": "main" "RELEASE_REPO": "grafana/loki" @@ -226,7 +226,7 @@ "loki-image": "env": "BUILD_TIMEOUT": 60 - "GO_VERSION": "1.23.5" + "GO_VERSION": "1.23.6" "IMAGE_PREFIX": "grafana" "RELEASE_LIB_REF": "main" "RELEASE_REPO": "grafana/loki" @@ -334,7 +334,7 @@ "promtail-image": "env": "BUILD_TIMEOUT": 60 - "GO_VERSION": "1.23.5" + "GO_VERSION": "1.23.6" "IMAGE_PREFIX": "grafana" "RELEASE_LIB_REF": "main" "RELEASE_REPO": "grafana/loki" diff --git a/.github/workflows/minor-release-pr.yml b/.github/workflows/minor-release-pr.yml index 80d0bccefedb7..7a15d1367f51b 100644 --- a/.github/workflows/minor-release-pr.yml +++ b/.github/workflows/minor-release-pr.yml @@ -16,7 +16,7 @@ jobs: check: uses: "grafana/loki-release/.github/workflows/check.yml@main" with: - build_image: "grafana/loki-build-image:0.34.4" + build_image: "grafana/loki-build-image:0.34.5" golang_ci_lint_version: "v1.60.3" release_lib_ref: "main" skip_validation: false @@ -144,7 +144,7 @@ jobs: --env SKIP_ARM \ --volume .:/src/loki \ --workdir /src/loki \ - --entrypoint /bin/sh "grafana/loki-build-image:0.34.4" + --entrypoint /bin/sh "grafana/loki-build-image:0.34.5" git config --global --add safe.directory /src/loki echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE make dist packages @@ -666,7 +666,7 @@ jobs: build-args: | IMAGE_TAG=${{ needs.version.outputs.version }} GOARCH=${{ steps.platform.outputs.platform_short }} - BUILD_IMAGE=grafana/loki-build-image:0.34.4 + BUILD_IMAGE=grafana/loki-build-image:0.34.5 context: "release" file: "release/clients/cmd/docker-driver/Dockerfile" outputs: "type=local,dest=release/plugins/loki-docker-driver-${{ needs.version.outputs.version}}-${{ steps.platform.outputs.platform }}" diff --git a/.github/workflows/patch-release-pr.yml b/.github/workflows/patch-release-pr.yml index cc601fc88d044..a3026c86cc3b0 100644 --- a/.github/workflows/patch-release-pr.yml +++ b/.github/workflows/patch-release-pr.yml @@ -16,7 +16,7 @@ jobs: check: uses: "grafana/loki-release/.github/workflows/check.yml@main" with: - build_image: "grafana/loki-build-image:0.34.4" + build_image: "grafana/loki-build-image:0.34.5" golang_ci_lint_version: "v1.60.3" release_lib_ref: "main" skip_validation: false @@ -144,7 +144,7 @@ jobs: --env SKIP_ARM \ --volume .:/src/loki \ --workdir /src/loki \ - --entrypoint /bin/sh "grafana/loki-build-image:0.34.4" + --entrypoint /bin/sh "grafana/loki-build-image:0.34.5" git config --global --add safe.directory /src/loki echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE make dist packages @@ -666,7 +666,7 @@ jobs: build-args: | IMAGE_TAG=${{ needs.version.outputs.version }} GOARCH=${{ steps.platform.outputs.platform_short }} - BUILD_IMAGE=grafana/loki-build-image:0.34.4 + BUILD_IMAGE=grafana/loki-build-image:0.34.5 context: "release" file: "release/clients/cmd/docker-driver/Dockerfile" outputs: "type=local,dest=release/plugins/loki-docker-driver-${{ needs.version.outputs.version}}-${{ steps.platform.outputs.platform }}" diff --git a/Makefile b/Makefile index 9e656269e49d6..e785b4bcb4dd1 100644 --- a/Makefile +++ b/Makefile @@ -18,8 +18,9 @@ BUILD_IN_CONTAINER ?= true CI ?= false # Ensure you run `make release-workflows` after changing this -GO_VERSION := 1.23.5 -BUILD_IMAGE_TAG := 0.34.4 +GO_VERSION := 1.23.6 +# Ensure you run `make IMAGE_TAG= build-image-push` after changing this +BUILD_IMAGE_TAG := 0.34.5 IMAGE_TAG ?= $(shell ./tools/image-tag) GIT_REVISION := $(shell git rev-parse --short HEAD) diff --git a/loki-build-image/README.md b/loki-build-image/README.md index 1a03c4700bca0..95cb72b3846ef 100644 --- a/loki-build-image/README.md +++ b/loki-build-image/README.md @@ -2,6 +2,10 @@ ## Versions +### 0.34.5 + +- Update to Go 1.23.6 + ### 0.34.4 - Update to Go 1.23.5 diff --git a/tools/lambda-promtail/Dockerfile b/tools/lambda-promtail/Dockerfile index a4dc4c4371af6..d59fdf59cfb8c 100644 --- a/tools/lambda-promtail/Dockerfile +++ b/tools/lambda-promtail/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22-alpine AS build-image +FROM golang:1.23-alpine AS build-image COPY tools/lambda-promtail /src/lambda-promtail WORKDIR /src/lambda-promtail