Merge pull request #137 from prometheus-community/repo_sync

Synchronize common files from prometheus/prometheus
This commit is contained in:
Ben Kochie 2022-01-16 05:53:58 +01:00 committed by GitHub
commit b585a8d067
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 43 deletions

View File

@ -1,25 +1,20 @@
--- ---
version: 2.1 version: 2.1
orbs: orbs:
prometheus: prometheus/prometheus@0.11.0 prometheus: prometheus/prometheus@0.15.0
executors: executors:
# This must match .promu.yml. # This must match .promu.yml.
golang: golang:
docker: docker:
- image: circleci/golang:1.17 - image: circleci/golang:1.17
jobs: jobs:
test: test:
executor: golang executor: golang
steps: steps:
- prometheus/setup_environment - prometheus/setup_environment
- run: make - run: make
- prometheus/store_artifact: - prometheus/store_artifact:
file: json_exporter file: json_exporter
workflows: workflows:
version: 2 version: 2
json_exporter: json_exporter:

View File

@ -78,7 +78,7 @@ ifneq ($(shell which gotestsum),)
endif endif
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 PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz
GOLANGCI_LINT := GOLANGCI_LINT :=