From a06dcd77719b49ce98abbc111ce2e30af0cb6690 Mon Sep 17 00:00:00 2001
From: Ben Kochie <superq@gmail.com>
Date: Tue, 13 Apr 2021 08:53:57 +0200
Subject: [PATCH] Update Makefile.common

* Bump promu to latest release.
* Bump golangci-lint to latest release.
* Add nolint to intentional error.

Signed-off-by: Ben Kochie <superq@gmail.com>
---
 Makefile.common           | 4 ++--
 pkg/labels/labels_test.go | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 86b2870a9..ce80d530a 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -78,12 +78,12 @@ ifneq ($(shell which gotestsum),)
 endif
 endif
 
-PROMU_VERSION ?= 0.11.1
+PROMU_VERSION ?= 0.12.0
 PROMU_URL     := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz
 
 GOLANGCI_LINT :=
 GOLANGCI_LINT_OPTS ?=
-GOLANGCI_LINT_VERSION ?= v1.36.0
+GOLANGCI_LINT_VERSION ?= v1.39.0
 # golangci-lint only supports linux, darwin and windows platforms on i386/amd64.
 # windows isn't included here because of the path separator being different.
 ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))
diff --git a/pkg/labels/labels_test.go b/pkg/labels/labels_test.go
index 984ce0b68..961c89938 100644
--- a/pkg/labels/labels_test.go
+++ b/pkg/labels/labels_test.go
@@ -387,7 +387,7 @@ func TestLabels_FromStrings(t *testing.T) {
 
 	require.Equal(t, expected, labels, "unexpected labelset")
 
-	require.Panics(t, func() { FromStrings("aaa", "111", "bbb") })
+	require.Panics(t, func() { FromStrings("aaa", "111", "bbb") }) //nolint:staticcheck // Ignore SA5012, error is intentional test.
 }
 
 func TestLabels_Compare(t *testing.T) {