From b83d5ac4b317f49df106f880657354a6a24a548b Mon Sep 17 00:00:00 2001 From: bluenviron-bot <214245907+bluenviron-bot@users.noreply.github.com> Date: Sun, 10 May 2026 17:54:18 +0200 Subject: [PATCH] bump golangci-lint to 2.12.2 (#5727) --- .github/workflows/lint.yml | 2 +- Makefile | 2 +- internal/conf/jsonwrapper/unmarshal.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9eef90fa..29206174 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -23,7 +23,7 @@ jobs: - uses: golangci/golangci-lint-action@v9 with: - version: v2.11.4 + version: v2.12.2 go_mod: runs-on: ubuntu-22.04 diff --git a/Makefile b/Makefile index a240fe89..9eb39ba5 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ BASE_IMAGE = golang:1.26-alpine3.23 -GOLANGCI_LINT_IMAGE = golangci/golangci-lint:v2.11.4 +GOLANGCI_LINT_IMAGE = golangci/golangci-lint:v2.12.2 NODE_IMAGE = node:20-alpine3.23 .PHONY: $(shell ls) diff --git a/internal/conf/jsonwrapper/unmarshal.go b/internal/conf/jsonwrapper/unmarshal.go index 225dc23d..0e7e16d0 100644 --- a/internal/conf/jsonwrapper/unmarshal.go +++ b/internal/conf/jsonwrapper/unmarshal.go @@ -28,7 +28,7 @@ func isJSONNull(raw json.RawMessage) bool { } func needsCustomDecode(t reflect.Type) bool { - for t.Kind() == reflect.Ptr { + for t.Kind() == reflect.Pointer { t = t.Elem() } return t.Kind() == reflect.Struct || t.Kind() == reflect.Slice @@ -47,7 +47,7 @@ func checkForUnknownFields(rawMap map[string]json.RawMessage, known map[string]i } func decode(v reflect.Value, raw json.RawMessage, path string) error { - for v.Kind() == reflect.Ptr { + for v.Kind() == reflect.Pointer { if isJSONNull(raw) { v.Set(reflect.Zero(v.Type())) return nil