Merge pull request #952 from prometheus/repo_sync

Synchronize common files from prometheus/prometheus
prometheus · Dec 21, 2021 · 98fbd99 · 98fbd99
2 parents dbf420e + 70a41d5
commit 98fbd99
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 orbs:
   go: circleci/go@0.2.0
-  prometheus: prometheus/prometheus@0.11.0
+  prometheus: prometheus/prometheus@0.15.0
 jobs:
   test:
     parameters:

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -7,13 +7,15 @@ on:
       - "**.go"
       - "scripts/errcheck_excludes.txt"
       - ".github/workflows/golangci-lint.yml"
+      - ".golangci.yml"
   pull_request:
     paths:
       - "go.sum"
       - "go.mod"
       - "**.go"
       - "scripts/errcheck_excludes.txt"
       - ".github/workflows/golangci-lint.yml"
+      - ".golangci.yml"
 
 jobs:
   golangci:

diff --git a/Makefile.common b/Makefile.common
@@ -78,7 +78,7 @@ ifneq ($(shell which gotestsum),)
 endif
 endif
 
-PROMU_VERSION ?= 0.12.0
+PROMU_VERSION ?= 0.13.0
 PROMU_URL     := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz
 
 GOLANGCI_LINT :=