From d7b869d85f763b49b0ba8902a0d5b5a1f129546b Mon Sep 17 00:00:00 2001 From: prombot Date: Sun, 16 Jan 2022 00:02:29 +0000 Subject: [PATCH] Update common Prometheus files Signed-off-by: prombot --- .circleci/config.yml | 79 +++++++++++++++++++++----------------------- Makefile.common | 2 +- 2 files changed, 38 insertions(+), 43 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index be78a979..9333cbdb 100644 --- a/.circleci/config.yml +++ b/.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 - - run: make - - prometheus/store_artifact: - file: json_exporter - + - prometheus/setup_environment + - run: make + - prometheus/store_artifact: + file: json_exporter workflows: version: 2 json_exporter: jobs: - - test: - filters: - tags: - only: /.*/ - - prometheus/build: - name: build - filters: - tags: - only: /.*/ - - prometheus/publish_master: - context: org-context - docker_hub_organization: prometheuscommunity - quay_io_organization: prometheuscommunity - requires: - - test - - build - filters: - branches: - only: master - - prometheus/publish_release: - context: org-context - docker_hub_organization: prometheuscommunity - quay_io_organization: prometheuscommunity - requires: - - test - - build - filters: - tags: - only: /^v.*/ - branches: - ignore: /.*/ + - test: + filters: + tags: + only: /.*/ + - prometheus/build: + name: build + filters: + tags: + only: /.*/ + - prometheus/publish_master: + context: org-context + docker_hub_organization: prometheuscommunity + quay_io_organization: prometheuscommunity + requires: + - test + - build + filters: + branches: + only: master + - prometheus/publish_release: + context: org-context + docker_hub_organization: prometheuscommunity + quay_io_organization: prometheuscommunity + requires: + - test + - build + filters: + tags: + only: /^v.*/ + branches: + ignore: /.*/ diff --git a/Makefile.common b/Makefile.common index ed7d1826..bf7304e5 100644 --- 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 :=