From f62c3b853539e4619fb216a12297e4bfc351f0fc Mon Sep 17 00:00:00 2001 From: prombot Date: Wed, 20 Mar 2024 17:48:25 +0000 Subject: [PATCH 1/2] Update common Prometheus files Signed-off-by: prombot --- .github/workflows/golangci-lint.yml | 2 +- Makefile.common | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 4dc7b830..5670d607 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -35,4 +35,4 @@ jobs: - name: Lint uses: golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804 # v4.0.0 with: - version: v1.55.2 + version: v1.56.2 diff --git a/Makefile.common b/Makefile.common index 49ed5f54..483b3bf9 100644 --- a/Makefile.common +++ b/Makefile.common @@ -61,7 +61,7 @@ PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_ SKIP_GOLANGCI_LINT := GOLANGCI_LINT := GOLANGCI_LINT_OPTS ?= -GOLANGCI_LINT_VERSION ?= v1.55.2 +GOLANGCI_LINT_VERSION ?= v1.56.2 # golangci-lint only supports linux, darwin and windows platforms on i386/amd64/arm64. # windows isn't included here because of the path separator being different. ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin)) From b850d7b5b91330dd13ddc568ec22b4e9ceb4144d Mon Sep 17 00:00:00 2001 From: SuperQ Date: Thu, 21 Mar 2024 16:43:43 +0100 Subject: [PATCH 2/2] Fixup gofumpt. Signed-off-by: SuperQ --- model/fingerprinting_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/model/fingerprinting_test.go b/model/fingerprinting_test.go index 98f49714..f4a4a3d5 100644 --- a/model/fingerprinting_test.go +++ b/model/fingerprinting_test.go @@ -33,7 +33,6 @@ func TestFingerprintFromString(t *testing.T) { } f, err = ParseFingerprint(fs) - if err != nil { t.Errorf("unexpected error while getting Fingerprint from string: %s", err.Error()) }