hanzo/logs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Update to go 1.25.7 (#20694)

Browse Source 
Co-authored-by: Trevor Whitney <trevorjwhitney@gmail.com>
This commit is contained in:
Salva Corts
2026-02-06 11:30:13 +01:00
committed by GitHub
co-authored by Trevor Whitney
parent b0c993eaf0
commit 3a6ba0d63c
15 changed files with 114 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.devcontainer/devcontainer.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"image": "grafana/loki-build-image:0.34.9",
"image": "grafana/loki-build-image:0.34.10",
"containerEnv": {
"BUILD_IN_CONTAINER": "false"
},
.github/workflows/build-loki-binary.yml
+1 -1
View File
@@ -9,7 +9,7 @@ permissions:
contents: read
env:
GO_VERSION: "1.25.5"
GO_VERSION: "1.25.7"
jobs:
build:
.github/workflows/check.yml
+1 -1
View File
@@ -2,7 +2,7 @@
"check":
"uses": "grafana/loki-release/.github/workflows/check.yml@fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
"with":
"build_image": "grafana/loki-build-image:0.34.9"
"build_image": "grafana/loki-build-image:0.34.10"
"golang_ci_lint_version": "v2.5.0"
"release_lib_ref": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
"skip_validation": false
.github/workflows/images.yml
+6 -6
View File
@@ -2,7 +2,7 @@
"check":
"uses": "grafana/loki-release/.github/workflows/check.yml@fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
"with":
"build_image": "grafana/loki-build-image:0.34.9"
"build_image": "grafana/loki-build-image:0.34.10"
"golang_ci_lint_version": "v2.5.0"
"release_lib_ref": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
"skip_validation": false
@@ -10,7 +10,7 @@
"loki-canary-boringcrypto-image":
"env":
"BUILD_TIMEOUT": 60
"GO_VERSION": "1.25.5"
"GO_VERSION": "1.25.7"
"IMAGE_PREFIX": "grafana"
"RELEASE_LIB_REF": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
"RELEASE_REPO": "grafana/loki"
@@ -134,7 +134,7 @@
"loki-canary-image":
"env":
"BUILD_TIMEOUT": 60
"GO_VERSION": "1.25.5"
"GO_VERSION": "1.25.7"
"IMAGE_PREFIX": "grafana"
"RELEASE_LIB_REF": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
"RELEASE_REPO": "grafana/loki"
@@ -258,7 +258,7 @@
"loki-image":
"env":
"BUILD_TIMEOUT": 60
"GO_VERSION": "1.25.5"
"GO_VERSION": "1.25.7"
"IMAGE_PREFIX": "grafana"
"RELEASE_LIB_REF": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
"RELEASE_REPO": "grafana/loki"
@@ -382,7 +382,7 @@
"promtail-image":
"env":
"BUILD_TIMEOUT": 60
"GO_VERSION": "1.25.5"
"GO_VERSION": "1.25.7"
"IMAGE_PREFIX": "grafana"
"RELEASE_LIB_REF": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
"RELEASE_REPO": "grafana/loki"
@@ -506,7 +506,7 @@
"querytee-image":
"env":
"BUILD_TIMEOUT": 60
"GO_VERSION": "1.25.5"
"GO_VERSION": "1.25.7"
"IMAGE_PREFIX": "grafana"
"RELEASE_LIB_REF": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
"RELEASE_REPO": "grafana/loki"
.github/workflows/logql-correctness.yml
+2 -2
View File
@@ -37,7 +37,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: "1.25.5"
go-version: "1.25.7"
# The metastore generates invalid filenames for Windows (with colons),
# which get rejected by upload-artifact. We zip these files to avoid this
@@ -84,7 +84,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: "1.25.5"
go-version: "1.25.7"
- name: Create results directory
run: mkdir -p ./pkg/logql/bench/results
.github/workflows/minor-release-pr.yml
+4 -4
View File
@@ -21,7 +21,7 @@ jobs:
pull-requests: "write"
uses: "grafana/loki-release/.github/workflows/check.yml@fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
with:
build_image: "grafana/loki-build-image:0.34.9"
build_image: "grafana/loki-build-image:0.34.10"
golang_ci_lint_version: "v2.5.0"
release_lib_ref: "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
skip_validation: false
@@ -180,10 +180,10 @@ jobs:
--env SKIP_ARM \
--volume .:/src/loki \
--workdir /src/loki \
--entrypoint /bin/sh "grafana/loki-build-image:0.34.9"
--entrypoint /bin/sh "grafana/loki-build-image:0.34.10"
git config --global --add safe.directory /src/loki
echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
if echo "grafana/loki-build-image:0.34.9" | grep -q "golang"; then
if echo "grafana/loki-build-image:0.34.10" | grep -q "golang"; then
/src/loki/.github/vendor/github.com/grafana/loki-release/workflows/install_workflow_dependencies.sh dist
fi
make dist packages
@@ -799,7 +799,7 @@ jobs:
build-args: |
IMAGE_TAG=${{ needs.version.outputs.version }}
GOARCH=${{ steps.platform.outputs.platform_short }}
BUILD_IMAGE=grafana/loki-build-image:0.34.9
BUILD_IMAGE=grafana/loki-build-image:0.34.10
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 }}"
.github/workflows/patch-release-pr.yml
+4 -4
View File
@@ -21,7 +21,7 @@ jobs:
pull-requests: "write"
uses: "grafana/loki-release/.github/workflows/check.yml@fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
with:
build_image: "grafana/loki-build-image:0.34.9"
build_image: "grafana/loki-build-image:0.34.10"
golang_ci_lint_version: "v2.5.0"
release_lib_ref: "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
skip_validation: false
@@ -180,10 +180,10 @@ jobs:
--env SKIP_ARM \
--volume .:/src/loki \
--workdir /src/loki \
--entrypoint /bin/sh "grafana/loki-build-image:0.34.9"
--entrypoint /bin/sh "grafana/loki-build-image:0.34.10"
git config --global --add safe.directory /src/loki
echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
if echo "grafana/loki-build-image:0.34.9" | grep -q "golang"; then
if echo "grafana/loki-build-image:0.34.10" | grep -q "golang"; then
/src/loki/.github/vendor/github.com/grafana/loki-release/workflows/install_workflow_dependencies.sh dist
fi
make dist packages
@@ -799,7 +799,7 @@ jobs:
build-args: |
IMAGE_TAG=${{ needs.version.outputs.version }}
GOARCH=${{ steps.platform.outputs.platform_short }}
BUILD_IMAGE=grafana/loki-build-image:0.34.9
BUILD_IMAGE=grafana/loki-build-image:0.34.10
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 }}"
.github/workflows/querytee-images.yml
+1 -1
View File
@@ -17,7 +17,7 @@ permissions:
env:
BUILD_TIMEOUT: 60
IMAGE_PREFIX: grafana
GO_VERSION: "1.25.5"
GO_VERSION: "1.25.7"
jobs:
loki-query-tee-image:
Makefile
+2 -2
View File
@@ -26,9 +26,9 @@ DOCKER_INTERACTIVE_FLAGS := --tty --interactive
endif
# Ensure you run `make release-workflows` after changing this
GO_VERSION := 1.25.5
GO_VERSION := 1.25.7
# Ensure you run `make IMAGE_TAG=<updated-tag> build-image-push` after changing this
BUILD_IMAGE_TAG := 0.34.9
BUILD_IMAGE_TAG := 0.34.10
IMAGE_TAG ?= $(shell ./tools/image-tag)
GIT_REVISION := $(shell git rev-parse --short HEAD)
flake.lock
Generated
+22 -5
View File
@@ -20,16 +20,32 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1762498405,
"narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=",
"lastModified": 1770136044,
"narHash": "sha256-tlFqNG/uzz2++aAmn4v8J0vAkV3z7XngeIIB3rM3650=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1",
"rev": "e576e3c9cf9bad747afcddd9e34f51d18c855b4e",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-25.05",
"ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1770197578,
"narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
@@ -37,7 +53,8 @@
"root": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable"
}
},
"systems": {
flake.nix
+52 -29
View File
@@ -3,17 +3,36 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
};
outputs = { self, nixpkgs, flake-utils }:
flake-utils.lib.eachDefaultSystem (system:
outputs =
{
self,
nixpkgs,
nixpkgs-unstable,
flake-utils,
}:
flake-utils.lib.eachDefaultSystem (
system:
let
pkgs = import nixpkgs
{
inherit system;
config = { allowUnfree = true; };
base = import nixpkgs {
inherit system;
config = {
allowUnfree = true;
};
};
unstable = import nixpkgs-unstable {
inherit system;
config = {
allowUnfree = true;
};
};
pkgs = base // {
inherit (unstable) buildGoModule;
};
in
rec {
packages = import ./nix {
@@ -26,33 +45,37 @@
apps = {
lint = {
type = "app";
program = with pkgs; "${
(writeShellScriptBin "lint.sh" ''
${nixpkgs-fmt}/bin/nixpkgs-fmt --check ${self}/flake.nix ${self}/nix/*.nix
${statix}/bin/statix check ${self}
'')
}/bin/lint.sh";
program =
with pkgs;
"${(writeShellScriptBin "lint.sh" ''
${nixpkgs-fmt}/bin/nixpkgs-fmt --check ${self}/flake.nix ${self}/nix/*.nix
${statix}/bin/statix check ${self}
'')}/bin/lint.sh";
};
};
devShell = pkgs.mkShell {
nativeBuildInputs = with pkgs; [
(pkgs.callPackage ./nix/packages/chart-releaser.nix {
inherit pkgs;
inherit (pkgs) buildGoModule fetchFromGitHub;
})
nativeBuildInputs =
with pkgs;
[
(pkgs.callPackage ./nix/packages/chart-releaser.nix {
inherit pkgs;
inherit (pkgs) buildGoModule fetchFromGitHub;
})
chart-testing
gcc
go_1_25
golangci-lint
gotools
helm-docs
nettools
nixpkgs-fmt
statix
yamllint
] ++ (builtins.attrValues packages);
chart-testing
gcc
go_1_25
golangci-lint
gotools
helm-docs
nettools
nixpkgs-fmt
statix
yamllint
]
++ (builtins.attrValues packages);
};
});
}
);
}
loki-build-image/Dockerfile
+1 -1
View File
@@ -4,7 +4,7 @@
# tag of the Docker image in `../.drone/drone.jsonnet` and run `make drone`.
# See ../docs/sources/community/maintaining/release-loki-build-image.md for instructions
# on how to publish a new build image.
ARG GO_VERSION=1.25.5
ARG GO_VERSION=1.25.7
ARG GOLANG_BASE_IMAGE=golang:${GO_VERSION}-trixie
# Install helm (https://helm.sh/) and helm-docs (https://github.com/norwoodj/helm-docs) for generating Helm Chart reference.
loki-build-image/README.md
+8
View File
@@ -2,6 +2,14 @@
## Versions
### 0.34.10
- Update to Go 1.25.7
### 0.34.9
- Update to Go 1.25.5
### 0.34.7
- Update to Go 1.24.8
nix/packages/loki.nix
+8 -3
View File
@@ -1,5 +1,10 @@
{ pkgs, version, imageTag, lib }:
pkgs.buildGo125Module {
{
pkgs,
version,
imageTag,
lib,
}:
pkgs.buildGoModule {
inherit version;
pname = "loki";
@@ -22,7 +27,7 @@ pkgs.buildGo125Module {
];
tags = [
"slicelabels"
"slicelabels"
];
subPackages = [ "cmd/loki" ];
operator/netlify.toml
+1 -1
View File
@@ -6,7 +6,7 @@
# HUGO_VERSION = "..." is set by bingo which allows reproducible local environment.
NODE_VERSION = "22.10.0"
NPM_VERSION = "10.9.0"
GO_VERSION = "1.25.5"
GO_VERSION = "1.25.7"
[context.production]
command = "(env && mkdir /tmp/gobin && make web GOBIN=/tmp/gobin) || (sleep 30; false)"