From 04174d7d7b24f26170aee498f005901e6d0956df Mon Sep 17 00:00:00 2001 From: PrometheusBot Date: Fri, 21 Jun 2024 16:14:46 +0200 Subject: [PATCH] Synchronize common files from prometheus/prometheus (#3848) * Update common Prometheus files Signed-off-by: prombot * chore: fix test Signed-off-by: Simon Pasquier --------- Signed-off-by: prombot Signed-off-by: Simon Pasquier Co-authored-by: Simon Pasquier --- .github/workflows/golangci-lint.yml | 9 +++++---- Makefile.common | 2 +- cluster/tls_transport_test.go | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index b36f71c3..5ceb5909 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -24,8 +24,8 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - name: install Go + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - name: Install Go uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: go-version: 1.22.x @@ -33,6 +33,7 @@ jobs: run: sudo apt-get update && sudo apt-get -y install libsnmp-dev if: github.repository == 'prometheus/snmp_exporter' - name: Lint - uses: golangci/golangci-lint-action@9d1e0624a798bb64f6c3cea93db47765312263dc # v5.1.0 + uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1 with: - version: v1.56.2 + args: --verbose + version: v1.59.0 diff --git a/Makefile.common b/Makefile.common index 0e9ace29..16172923 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.56.2 +GOLANGCI_LINT_VERSION ?= v1.59.0 # 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)) diff --git a/cluster/tls_transport_test.go b/cluster/tls_transport_test.go index ac8d1c95..5b9e3d51 100644 --- a/cluster/tls_transport_test.go +++ b/cluster/tls_transport_test.go @@ -217,7 +217,7 @@ func TestDialTimeout(t *testing.T) { sent := []byte(("test stream")) m, err := from.Write(sent) require.NoError(t, err) - require.Greater(t, m, 0) + require.Positive(t, m) wg.Wait()