Merge pull request #137 from prometheus-community/repo_sync

Synchronize common files from prometheus/prometheus

.circleci/config.yml

@@ -1,57 +1,52 @@
 ---
 version: 2.1
-
 orbs:
-  prometheus: prometheus/prometheus@0.11.0
+  prometheus: prometheus/prometheus@0.15.0
-
 executors:
   # This must match .promu.yml.
   golang:
     docker:
-    - image: circleci/golang:1.17
+      - image: circleci/golang:1.17
-
 jobs:
   test:
     executor: golang
-
     steps:
-    - prometheus/setup_environment
+      - prometheus/setup_environment
-    - run: make
+      - run: make
-    - prometheus/store_artifact:
+      - prometheus/store_artifact:
-        file: json_exporter
+          file: json_exporter
-
 workflows:
   version: 2
   json_exporter:
     jobs:
-    - test:
+      - test:
-        filters:
+          filters:
-          tags:
+            tags:
-            only: /.*/
+              only: /.*/
-    - prometheus/build:
+      - prometheus/build:
-        name: build
+          name: build
-        filters:
+          filters:
-          tags:
+            tags:
-            only: /.*/
+              only: /.*/
-    - prometheus/publish_master:
+      - prometheus/publish_master:
-        context: org-context
+          context: org-context
-        docker_hub_organization: prometheuscommunity
+          docker_hub_organization: prometheuscommunity
-        quay_io_organization: prometheuscommunity
+          quay_io_organization: prometheuscommunity
-        requires:
+          requires:
-        - test
+            - test
-        - build
+            - build
-        filters:
+          filters:
-          branches:
+            branches:
-            only: master
+              only: master
-    - prometheus/publish_release:
+      - prometheus/publish_release:
-        context: org-context
+          context: org-context
-        docker_hub_organization: prometheuscommunity
+          docker_hub_organization: prometheuscommunity
-        quay_io_organization: prometheuscommunity
+          quay_io_organization: prometheuscommunity
-        requires:
+          requires:
-        - test
+            - test
-        - build
+            - build
-        filters:
+          filters:
-          tags:
+            tags:
-            only: /^v.*/
+              only: /^v.*/
-          branches:
+            branches:
-            ignore: /.*/
+              ignore: /.*/

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 :=