Merge pull request #392 from prometheus/repo_sync

Synchronize common files from prometheus/prometheus
prometheus · Mar 18, 2021 · 6800dee · 6800dee
2 parents 39e6403 + c136774
commit 6800dee
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 77 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,7 +8,7 @@ executors:
   # Whenever the Go version is updated here, .promu.yml should also be updated.
   golang:
     docker:
-    - image: circleci/golang:1.15
+    - image: circleci/golang:1.16
 
 jobs:
   test:

diff --git a/.promu.yml b/.promu.yml
@@ -1,7 +1,7 @@
 go:
     # Whenever the Go version is updated here, .circle/config.yml should also
     # be updated.
-    version: 1.15
+    version: 1.16
 repository:
     path: github.com/prometheus/pushgateway
 build:

diff --git a/Makefile.common b/Makefile.common
@@ -78,7 +78,7 @@ ifneq ($(shell which gotestsum),)
 endif
 endif
 
-PROMU_VERSION ?= 0.7.0
+PROMU_VERSION ?= 0.10.0
 PROMU_URL     := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz
 
 GOLANGCI_LINT :=
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ executors: @@
       # Whenever the Go version is updated here, .promu.yml should also be updated.
       golang:
         docker:
-        - image: circleci/golang:1.15
+        - image: circleci/golang:1.16
     jobs:
       test:
@@ Expand Down @@