From 7b7d4b60be98376eb83dd15c729d7db709e50a6a Mon Sep 17 00:00:00 2001 From: Sophie Waldman Date: Mon, 28 Jul 2025 13:53:05 -0400 Subject: [PATCH 1/6] Refactor: Update to latest version of golangci-lint --- .golangci.yml | 120 ++++++++++++++++++++++++++++---------------------- 1 file changed, 67 insertions(+), 53 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 9da4ae0dc3d82..9c99bcc6d4a84 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,5 +1,6 @@ # This file contains all available configuration options # with their default values. +version: "2" # options for analysis running run: @@ -28,30 +29,33 @@ run: output: formats: # colored-line-number|line-number|json|tab|checkstyle, default is "colored-line-number" - - format: colored-line-number + text: + print-issued-lines: true + colors: true + print-linter-name: true - # print lines of code with issue, default is true - print-issued-lines: true - - # print linter name in the end of issue text, default is true - print-linter-name: true - -linters-settings: - goimports: - local-prefixes: github.com/grafana/loki/pkg,github.com/grafana/loki/tools - - depguard: - rules: - Main: - deny: - - desc: "Use github.com/go-kit/log instead of github.com/go-kit/kit/log" - pkg: github.com/go-kit/kit/log - - misspell: - ignore-words: - - strat +formatters: + enable: + - goimports + - gofmt + - goimports + settings: + goimports: + local-prefixes: + - github.com/grafana/loki/pkg,github.com/grafana/loki/tools linters: + settings: + depguard: + rules: + Main: + deny: + - desc: "Use github.com/go-kit/log instead of github.com/go-kit/kit/log" + pkg: github.com/go-kit/kit/log + + misspell: + ignore-rules: + - strat enable: - errcheck - goconst @@ -60,45 +64,55 @@ linters: - misspell - unconvert - govet - - typecheck - depguard - copyloopvar - - gofmt - - goimports - - gosimple - staticcheck - gochecksumtype disable: - unused - unparam + exclusions: + rules: + - linters: + - all + text: "Error return value of .*log\\.Logger\\)\\.Log\x60 is not checked" + - linters: + - all + text: "Error return value of .*.Log.* is not checked" + - linters: + - all + text: "Error return value of `` is not checked" + - linters: + - all + text: "Error return value of `.*WriteString` is not checked" + - linters: + - all + path: pkg/scheduler/scheduler.go + - path: '(.+)_test\.go' + linters: + - goconst + - linters: + - all + path: pkg/scheduler/scheduler.go + text: "SA1019: msg.GetHttpRequest is deprecated: Do not use" + - linters: + - all + path: "win_eventlog$" + - linters: + - all + path: "operator" + - linters: + - all + path: ".*.pb.go" + - linters: + - all + path: ".*.y.go" + - linters: + - all + path: ".*.rl.go" + - linters: + - all + path: ".*.deepcopy.go" issues: - exclude: - - Error return value of .*log\.Logger\)\.Log\x60 is not checked - - Error return value of .*.Log.* is not checked - - Error return value of `` is not checked - - Error return value of `.*WriteString` is not checked - exclude-rules: - - path: pkg/scheduler/scheduler.go - text: 'SA1019: msg.GetHttpRequest is deprecated: Do not use' - - path: '(.+)_test\.go' - linters: - - goconst fix: true - # which dirs to skip: they won't be analyzed; - # can use regexp here: generated.*, regexp is applied on full path; - # default value is empty list, but next dirs are always skipped independently - # from this option's value: - # vendor$, third_party$, testdata$, examples$, Godeps$, builtin$ - exclude-dirs: - - win_eventlog$ - - operator - # which files to skip: they will be analyzed, but issues from them - # won't be reported. Default value is empty list, but there is - # no need to include all autogenerated files, we confidently recognize - # autogenerated files. If it's not please let us know. - exclude-files: - - .*.pb.go - - .*.y.go - - .*.rl.go - - .*.deepcopy.go From 6d4d9dd240bbdfbda184e3fa2b4bb3683f2268f3 Mon Sep 17 00:00:00 2001 From: Sophie Waldman Date: Mon, 28 Jul 2025 16:07:18 -0400 Subject: [PATCH 2/6] Chore: Update remaining golangci-lint calls to 2.3.0 --- .github/release-workflows.jsonnet | 2 +- .../github.com/grafana/loki-release/workflows/main.jsonnet | 2 +- .../grafana/loki-release/workflows/validate-gel.libsonnet | 2 +- .../grafana/loki-release/workflows/validate.libsonnet | 2 +- .github/workflows/operator.yaml | 2 +- operator/.bingo/Variables.mk | 4 ++-- operator/.bingo/golangci-lint.mod | 2 +- operator/.bingo/variables.env | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/release-workflows.jsonnet b/.github/release-workflows.jsonnet index 4f15de0cd3ad9..fd8f52194e79a 100644 --- a/.github/release-workflows.jsonnet +++ b/.github/release-workflows.jsonnet @@ -7,7 +7,7 @@ local checkTemplate = 'grafana/loki-release/.github/workflows/check.yml@%s' % re local buildImageVersion = std.extVar('BUILD_IMAGE_VERSION'); local goVersion = std.extVar('GO_VERSION'); local buildImage = 'grafana/loki-build-image:%s' % buildImageVersion; -local golangCiLintVersion = 'v1.64.5'; +local golangCiLintVersion = 'v2.3.0'; local imageBuildTimeoutMin = 60; local imagePrefix = 'grafana'; local dockerPluginDir = 'clients/cmd/docker-driver'; diff --git a/.github/vendor/github.com/grafana/loki-release/workflows/main.jsonnet b/.github/vendor/github.com/grafana/loki-release/workflows/main.jsonnet index 6b4e09fcb7bcd..880e17bd76ff3 100644 --- a/.github/vendor/github.com/grafana/loki-release/workflows/main.jsonnet +++ b/.github/vendor/github.com/grafana/loki-release/workflows/main.jsonnet @@ -16,7 +16,7 @@ distMakeTargets=['dist', 'packages'], dryRun=false, dockerUsername='grafana', - golangCiLintVersion='v1.64.5', + golangCiLintVersion='v2.3.0', imageBuildTimeoutMin=25, imageJobs={}, imagePrefix='grafana', diff --git a/.github/vendor/github.com/grafana/loki-release/workflows/validate-gel.libsonnet b/.github/vendor/github.com/grafana/loki-release/workflows/validate-gel.libsonnet index ba59986bdde4d..27cd796bfbd52 100644 --- a/.github/vendor/github.com/grafana/loki-release/workflows/validate-gel.libsonnet +++ b/.github/vendor/github.com/grafana/loki-release/workflows/validate-gel.libsonnet @@ -53,7 +53,7 @@ local validationJob = _validationJob(false); validationJob + job.withSteps( [ - step.new('golangci-lint', 'golangci/golangci-lint-action@08e2f20817b15149a52b5b3ebe7de50aff2ba8c5') + step.new('golangci-lint', 'golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9') + step.withIf('${{ !fromJSON(env.SKIP_VALIDATION) }}') + step.with({ version: '${{ inputs.golang_ci_lint_version }}', diff --git a/.github/vendor/github.com/grafana/loki-release/workflows/validate.libsonnet b/.github/vendor/github.com/grafana/loki-release/workflows/validate.libsonnet index 05b22d5668923..e0d887ef100fe 100644 --- a/.github/vendor/github.com/grafana/loki-release/workflows/validate.libsonnet +++ b/.github/vendor/github.com/grafana/loki-release/workflows/validate.libsonnet @@ -170,7 +170,7 @@ local validationJob = _validationJob(false); + job.withSteps( [ common.checkout, - step.new('golangci-lint', 'golangci/golangci-lint-action@08e2f20817b15149a52b5b3ebe7de50aff2ba8c5') + step.new('golangci-lint', 'golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9') + step.withIf('${{ !fromJSON(env.SKIP_VALIDATION) }}') + step.with({ version: '${{ inputs.golang_ci_lint_version }}', diff --git a/.github/workflows/operator.yaml b/.github/workflows/operator.yaml index 1cca514fba33e..4e71269f3b800 100644 --- a/.github/workflows/operator.yaml +++ b/.github/workflows/operator.yaml @@ -47,7 +47,7 @@ jobs: with: go-version-file: ./operator/go.mod - name: Lint - uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7 + uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8 with: version: v2.0.2 args: --timeout=5m diff --git a/operator/.bingo/Variables.mk b/operator/.bingo/Variables.mk index e26c15deae09b..6361183cf210a 100644 --- a/operator/.bingo/Variables.mk +++ b/operator/.bingo/Variables.mk @@ -41,10 +41,10 @@ $(GOFUMPT): $(BINGO_DIR)/gofumpt.mod @echo "(re)installing $(GOBIN)/gofumpt-v0.7.0" @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=gofumpt.mod -o=$(GOBIN)/gofumpt-v0.7.0 "mvdan.cc/gofumpt" -GOLANGCI_LINT := $(GOBIN)/golangci-lint-v2.0.2 +GOLANGCI_LINT := $(GOBIN)/golangci-lint-v2.3.0 $(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. - @echo "(re)installing $(GOBIN)/golangci-lint-v2.0.2" + @echo "(re)installing $(GOBIN)/golangci-lint-v2.3.0" @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v2.0.2 "github.com/golangci/golangci-lint/v2/cmd/golangci-lint" HUGO := $(GOBIN)/hugo-v0.80.0 diff --git a/operator/.bingo/golangci-lint.mod b/operator/.bingo/golangci-lint.mod index c90aa1d27bc1d..9e4a828dd589f 100644 --- a/operator/.bingo/golangci-lint.mod +++ b/operator/.bingo/golangci-lint.mod @@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT go 1.23.6 -require github.com/golangci/golangci-lint/v2 v2.0.2 // cmd/golangci-lint +require github.com/golangci/golangci-lint/v2 v2.3.0 // cmd/golangci-lint diff --git a/operator/.bingo/variables.env b/operator/.bingo/variables.env index fd52b7fa7d3f2..61194326e2bdd 100644 --- a/operator/.bingo/variables.env +++ b/operator/.bingo/variables.env @@ -16,7 +16,7 @@ GEN_CRD_API_REFERENCE_DOCS="${GOBIN}/gen-crd-api-reference-docs-v0.0.3" GOFUMPT="${GOBIN}/gofumpt-v0.7.0" -GOLANGCI_LINT="${GOBIN}/golangci-lint-v2.0.2" +GOLANGCI_LINT="${GOBIN}/golangci-lint-v2.3.0" HUGO="${GOBIN}/hugo-v0.80.0" From 42d6846fe6c3580ddd083068b586359ad847ef73 Mon Sep 17 00:00:00 2001 From: Sophie Waldman Date: Thu, 28 Aug 2025 17:07:16 -0400 Subject: [PATCH 3/6] Use golangci migrate to edit .golangci.yml Changes around some ordering, formatting, and rule listings --- .golangci.yml | 152 ++++++++++++++++++++++---------------------------- 1 file changed, 67 insertions(+), 85 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 9c99bcc6d4a84..4e26ac2f078f6 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,118 +1,100 @@ # This file contains all available configuration options # with their default values. version: "2" - # options for analysis running run: - # define go version - go: "1.24" - # default concurrency is a available CPU number concurrency: 16 - - # timeout for analysis, e.g. 30s, 5m, default is 1m - timeout: 10m - - # exit code when at least one issue was found, default is 1 - issues-exit-code: 1 - - # include test files or not, default is true - tests: true - + # define go version + go: "1.24" # list of build tags, all linters use it. Default is empty list. build-tags: - cgo - integration - slicelabels - + # exit code when at least one issue was found, default is 1 + issues-exit-code: 1 + # include test files or not, default is true + tests: true # output configuration options output: formats: - # colored-line-number|line-number|json|tab|checkstyle, default is "colored-line-number" text: + path: stdout + print-linter-name: true print-issued-lines: true colors: true - print-linter-name: true - -formatters: - enable: - - goimports - - gofmt - - goimports - settings: - goimports: - local-prefixes: - - github.com/grafana/loki/pkg,github.com/grafana/loki/tools - linters: - settings: - depguard: - rules: - Main: - deny: - - desc: "Use github.com/go-kit/log instead of github.com/go-kit/kit/log" - pkg: github.com/go-kit/kit/log - - misspell: - ignore-rules: - - strat enable: + - copyloopvar + - depguard - errcheck + - gochecksumtype - goconst - - revive + - govet - ineffassign - misspell - - unconvert - - govet - - depguard - - copyloopvar + - revive - staticcheck - - gochecksumtype + - unconvert disable: - - unused - unparam + - unused + settings: + depguard: + rules: + Main: + deny: + - pkg: github.com/go-kit/kit/log + desc: Use github.com/go-kit/log instead of github.com/go-kit/kit/log + misspell: + ignore-rules: + - strat exclusions: + generated: lax + presets: + - comments + - common-false-positives + - legacy + - std-error-handling rules: + - path: pkg/scheduler/scheduler.go + text: 'SA1019: msg.GetHttpRequest is deprecated: Do not use' - linters: - - all - text: "Error return value of .*log\\.Logger\\)\\.Log\x60 is not checked" - - linters: - - all - text: "Error return value of .*.Log.* is not checked" - - linters: - - all - text: "Error return value of `` is not checked" - - linters: - - all - text: "Error return value of `.*WriteString` is not checked" - - - linters: - - all - path: pkg/scheduler/scheduler.go - - path: '(.+)_test\.go' - linters: - goconst - - linters: - - all - path: pkg/scheduler/scheduler.go - text: "SA1019: msg.GetHttpRequest is deprecated: Do not use" - - linters: - - all - path: "win_eventlog$" - - linters: - - all - path: "operator" - - linters: - - all - path: ".*.pb.go" - - linters: - - all - path: ".*.y.go" - - linters: - - all - path: ".*.rl.go" - - linters: - - all - path: ".*.deepcopy.go" + path: (.+)_test\.go + - path: (.+)\.go$ + text: Error return value of .*log\.Logger\)\.Log\x60 is not checked + - path: (.+)\.go$ + text: Error return value of .*.Log.* is not checked + - path: (.+)\.go$ + text: Error return value of `` is not checked + - path: (.+)\.go$ + text: Error return value of `.*WriteString` is not checked + paths: + - .*.pb.go + - .*.y.go + - .*.rl.go + - .*.deepcopy.go + - win_eventlog$ + - operator issues: fix: true +formatters: + enable: + - gofmt + - goimports + settings: + goimports: + local-prefixes: + - github.com/grafana/loki/pkg + - github.com/grafana/loki/tools + exclusions: + generated: lax + paths: + - .*.pb.go + - .*.y.go + - .*.rl.go + - .*.deepcopy.go + - win_eventlog$ + - operator From 387c061975f6029adeaa35a6367e00377fef4ca3 Mon Sep 17 00:00:00 2001 From: Sophie Waldman Date: Thu, 28 Aug 2025 17:11:01 -0400 Subject: [PATCH 4/6] Upgrade golangci version in Github action to 2.3.0 --- .github/workflows/operator.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/operator.yaml b/.github/workflows/operator.yaml index 4e71269f3b800..9d1bb73257bba 100644 --- a/.github/workflows/operator.yaml +++ b/.github/workflows/operator.yaml @@ -49,7 +49,7 @@ jobs: - name: Lint uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8 with: - version: v2.0.2 + version: v2.3.0 args: --timeout=5m working-directory: ./operator - name: Check prometheus rules From 5460797f267e021a23edde7591cfd28917b4768d Mon Sep 17 00:00:00 2001 From: Sophie Waldman Date: Thu, 28 Aug 2025 17:12:40 -0400 Subject: [PATCH 5/6] Update golangcilint version in bingo --- operator/.bingo/Variables.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operator/.bingo/Variables.mk b/operator/.bingo/Variables.mk index 6361183cf210a..51e8a7fe19ab4 100644 --- a/operator/.bingo/Variables.mk +++ b/operator/.bingo/Variables.mk @@ -45,7 +45,7 @@ GOLANGCI_LINT := $(GOBIN)/golangci-lint-v2.3.0 $(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. @echo "(re)installing $(GOBIN)/golangci-lint-v2.3.0" - @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v2.0.2 "github.com/golangci/golangci-lint/v2/cmd/golangci-lint" + @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v2.3.0 "github.com/golangci/golangci-lint/v2/cmd/golangci-lint" HUGO := $(GOBIN)/hugo-v0.80.0 $(HUGO): $(BINGO_DIR)/hugo.mod From b64bb153f617ff4166dcc1f596de1ad99c699d34 Mon Sep 17 00:00:00 2001 From: Sophie Waldman Date: Thu, 4 Sep 2025 14:57:30 -0400 Subject: [PATCH 6/6] Update loki-release version and run make release-workflows --- .github/jsonnetfile.json | 2 +- .github/jsonnetfile.lock.json | 4 ++-- .../grafana/loki-release/workflows/main.jsonnet | 4 ++-- .github/workflows/check.yml | 6 +++--- .github/workflows/images.yml | 14 +++++++------- .github/workflows/minor-release-pr.yml | 8 ++++---- .github/workflows/patch-release-pr.yml | 8 ++++---- .github/workflows/release.yml | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/jsonnetfile.json b/.github/jsonnetfile.json index e5c6335a2c9ec..e276e88059b27 100644 --- a/.github/jsonnetfile.json +++ b/.github/jsonnetfile.json @@ -8,7 +8,7 @@ "subdir": "workflows" } }, - "version": "1dd22f1dbfa671ac40e4a92f1a56bd9821871d44" + "version": "6c4953b6960ddbed8db8c9b05dd34fc04777615d" } ], "legacyImports": true diff --git a/.github/jsonnetfile.lock.json b/.github/jsonnetfile.lock.json index 1bb9b61b157a0..e2725da876be8 100644 --- a/.github/jsonnetfile.lock.json +++ b/.github/jsonnetfile.lock.json @@ -8,8 +8,8 @@ "subdir": "workflows" } }, - "version": "1dd22f1dbfa671ac40e4a92f1a56bd9821871d44", - "sum": "/Gk8/aqedF23h3wjwG05d8rJJiTMVWHqfceXDOboJBg=" + "version": "6c4953b6960ddbed8db8c9b05dd34fc04777615d", + "sum": "cmCJspuBE+wmv0wm94z1sZPTPrs0pdkJ63IDEgTxKUE=" } ], "legacyImports": false diff --git a/.github/vendor/github.com/grafana/loki-release/workflows/main.jsonnet b/.github/vendor/github.com/grafana/loki-release/workflows/main.jsonnet index 880e17bd76ff3..d21321af91e6c 100644 --- a/.github/vendor/github.com/grafana/loki-release/workflows/main.jsonnet +++ b/.github/vendor/github.com/grafana/loki-release/workflows/main.jsonnet @@ -178,7 +178,7 @@ type: 'boolean', }, golang_ci_lint_version: { - default: 'v1.64.5', + default: 'v2.3.0', description: 'version of golangci-lint to use', required: false, type: 'string', @@ -228,7 +228,7 @@ type: 'boolean', }, golang_ci_lint_version: { - default: 'v1.64.5', + default: 'v2.3.0', description: 'version of golangci-lint to use', required: false, type: 'string', diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index a36ee83e84cde..0bfa4ee9d8c74 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -1,10 +1,10 @@ "jobs": "check": - "uses": "grafana/loki-release/.github/workflows/check.yml@1dd22f1dbfa671ac40e4a92f1a56bd9821871d44" + "uses": "grafana/loki-release/.github/workflows/check.yml@6c4953b6960ddbed8db8c9b05dd34fc04777615d" "with": "build_image": "grafana/loki-build-image:0.34.6" - "golang_ci_lint_version": "v1.64.5" - "release_lib_ref": "1dd22f1dbfa671ac40e4a92f1a56bd9821871d44" + "golang_ci_lint_version": "v2.3.0" + "release_lib_ref": "6c4953b6960ddbed8db8c9b05dd34fc04777615d" "skip_validation": false "use_github_app_token": true "name": "check" diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml index 64ff1713bfb3c..8cc61aeebd92a 100644 --- a/.github/workflows/images.yml +++ b/.github/workflows/images.yml @@ -1,10 +1,10 @@ "jobs": "check": - "uses": "grafana/loki-release/.github/workflows/check.yml@1dd22f1dbfa671ac40e4a92f1a56bd9821871d44" + "uses": "grafana/loki-release/.github/workflows/check.yml@6c4953b6960ddbed8db8c9b05dd34fc04777615d" "with": "build_image": "grafana/loki-build-image:0.34.6" - "golang_ci_lint_version": "v1.64.5" - "release_lib_ref": "1dd22f1dbfa671ac40e4a92f1a56bd9821871d44" + "golang_ci_lint_version": "v2.3.0" + "release_lib_ref": "6c4953b6960ddbed8db8c9b05dd34fc04777615d" "skip_validation": false "use_github_app_token": true "loki-canary-boringcrypto-image": @@ -12,7 +12,7 @@ "BUILD_TIMEOUT": 60 "GO_VERSION": "1.24.6" "IMAGE_PREFIX": "grafana" - "RELEASE_LIB_REF": "1dd22f1dbfa671ac40e4a92f1a56bd9821871d44" + "RELEASE_LIB_REF": "6c4953b6960ddbed8db8c9b05dd34fc04777615d" "RELEASE_REPO": "grafana/loki" "needs": - "check" @@ -135,7 +135,7 @@ "BUILD_TIMEOUT": 60 "GO_VERSION": "1.24.6" "IMAGE_PREFIX": "grafana" - "RELEASE_LIB_REF": "1dd22f1dbfa671ac40e4a92f1a56bd9821871d44" + "RELEASE_LIB_REF": "6c4953b6960ddbed8db8c9b05dd34fc04777615d" "RELEASE_REPO": "grafana/loki" "needs": - "check" @@ -258,7 +258,7 @@ "BUILD_TIMEOUT": 60 "GO_VERSION": "1.24.6" "IMAGE_PREFIX": "grafana" - "RELEASE_LIB_REF": "1dd22f1dbfa671ac40e4a92f1a56bd9821871d44" + "RELEASE_LIB_REF": "6c4953b6960ddbed8db8c9b05dd34fc04777615d" "RELEASE_REPO": "grafana/loki" "needs": - "check" @@ -381,7 +381,7 @@ "BUILD_TIMEOUT": 60 "GO_VERSION": "1.24.6" "IMAGE_PREFIX": "grafana" - "RELEASE_LIB_REF": "1dd22f1dbfa671ac40e4a92f1a56bd9821871d44" + "RELEASE_LIB_REF": "6c4953b6960ddbed8db8c9b05dd34fc04777615d" "RELEASE_REPO": "grafana/loki" "needs": - "check" diff --git a/.github/workflows/minor-release-pr.yml b/.github/workflows/minor-release-pr.yml index a3e92d660726a..90e301385b1f0 100644 --- a/.github/workflows/minor-release-pr.yml +++ b/.github/workflows/minor-release-pr.yml @@ -8,7 +8,7 @@ env: DRY_RUN: false GITHUB_APP: "loki-gh-app" IMAGE_PREFIX: "grafana" - RELEASE_LIB_REF: "1dd22f1dbfa671ac40e4a92f1a56bd9821871d44" + RELEASE_LIB_REF: "6c4953b6960ddbed8db8c9b05dd34fc04777615d" RELEASE_REPO: "grafana/loki" SKIP_VALIDATION: false USE_GITHUB_APP_TOKEN: true @@ -19,11 +19,11 @@ jobs: contents: "write" id-token: "write" pull-requests: "write" - uses: "grafana/loki-release/.github/workflows/check.yml@1dd22f1dbfa671ac40e4a92f1a56bd9821871d44" + uses: "grafana/loki-release/.github/workflows/check.yml@6c4953b6960ddbed8db8c9b05dd34fc04777615d" with: build_image: "grafana/loki-build-image:0.34.6" - golang_ci_lint_version: "v1.64.5" - release_lib_ref: "1dd22f1dbfa671ac40e4a92f1a56bd9821871d44" + golang_ci_lint_version: "v2.3.0" + release_lib_ref: "6c4953b6960ddbed8db8c9b05dd34fc04777615d" skip_validation: false use_github_app_token: true create-release-pr: diff --git a/.github/workflows/patch-release-pr.yml b/.github/workflows/patch-release-pr.yml index dd353b48f9d4b..410fc05579bee 100644 --- a/.github/workflows/patch-release-pr.yml +++ b/.github/workflows/patch-release-pr.yml @@ -8,7 +8,7 @@ env: DRY_RUN: false GITHUB_APP: "loki-gh-app" IMAGE_PREFIX: "grafana" - RELEASE_LIB_REF: "1dd22f1dbfa671ac40e4a92f1a56bd9821871d44" + RELEASE_LIB_REF: "6c4953b6960ddbed8db8c9b05dd34fc04777615d" RELEASE_REPO: "grafana/loki" SKIP_VALIDATION: false USE_GITHUB_APP_TOKEN: true @@ -19,11 +19,11 @@ jobs: contents: "write" id-token: "write" pull-requests: "write" - uses: "grafana/loki-release/.github/workflows/check.yml@1dd22f1dbfa671ac40e4a92f1a56bd9821871d44" + uses: "grafana/loki-release/.github/workflows/check.yml@6c4953b6960ddbed8db8c9b05dd34fc04777615d" with: build_image: "grafana/loki-build-image:0.34.6" - golang_ci_lint_version: "v1.64.5" - release_lib_ref: "1dd22f1dbfa671ac40e4a92f1a56bd9821871d44" + golang_ci_lint_version: "v2.3.0" + release_lib_ref: "6c4953b6960ddbed8db8c9b05dd34fc04777615d" skip_validation: false use_github_app_token: true create-release-pr: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 86a4d60fe2fa5..c04b9683d4224 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,7 +5,7 @@ env: GITHUB_APP: "loki-gh-app" IMAGE_PREFIX: "grafana" PUBLISH_TO_GCS: false - RELEASE_LIB_REF: "1dd22f1dbfa671ac40e4a92f1a56bd9821871d44" + RELEASE_LIB_REF: "6c4953b6960ddbed8db8c9b05dd34fc04777615d" RELEASE_REPO: "grafana/loki" USE_GITHUB_APP_TOKEN: true jobs: