Skip to content

Commit

Permalink
Synchronize common files from prometheus/prometheus (#606)
Browse files Browse the repository at this point in the history
* Update common Prometheus files

Signed-off-by: prombot <prometheus-team@googlegroups.com>

* Fixup gofumpt.

Signed-off-by: SuperQ <superq@gmail.com>

---------

Signed-off-by: prombot <prometheus-team@googlegroups.com>
Signed-off-by: SuperQ <superq@gmail.com>
Co-authored-by: SuperQ <superq@gmail.com>
  • Loading branch information
prombot and SuperQ authored Mar 21, 2024
1 parent 057bec8 commit 617b51d
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
1 change: 0 additions & 1 deletion model/fingerprinting_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}
Expand Down

0 comments on commit 617b51d

Please sign in to comment.