From 9fbb56c9c80d5486d6de5e06a224a1eb343b28e7 Mon Sep 17 00:00:00 2001 From: PrometheusBot Date: Fri, 19 Nov 2021 09:18:01 +0100 Subject: [PATCH] Update common Prometheus files (#2214) Signed-off-by: prombot --- .circleci/config.yml | 16 +--------------- Makefile.common | 2 +- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c31a6a82..0a34c70e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,36 +1,29 @@ --- version: 2.1 - orbs: - prometheus: prometheus/prometheus@0.11.0 - + prometheus: prometheus/prometheus@0.14.0 executors: # Whenever the Go version is updated here, .promu.yml and .promu-cgo.yml # should also be updated. golang: docker: - image: circleci/golang:1.17 - jobs: test: executor: golang - steps: - prometheus/setup_environment - run: go mod download - run: make - prometheus/store_artifact: file: node_exporter - codespell: docker: - image: circleci/python - steps: - checkout - run: sudo pip install codespell - run: codespell --skip=".git,./vendor,ttar,go.mod,go.sum,*pem,./collector/fixtures" -L uint,packages\',uptodate - test_mixins: executor: golang steps: @@ -43,13 +36,10 @@ jobs: - run: make -C docs/node-mixin jb_install - run: make -C docs/node-mixin - run: git diff --exit-code - build: machine: image: ubuntu-2004:202101-01 - parallelism: 3 - steps: - prometheus/setup_environment - run: docker run --privileged linuxkit/binfmt:v0.8 @@ -62,15 +52,12 @@ jobs: - store_artifacts: path: .build destination: /build - test_docker: machine: image: ubuntu-2004:202101-01 - environment: DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.16-base REPO_PATH: github.com/prometheus/node_exporter - steps: - prometheus/setup_environment - attach_workspace: @@ -91,7 +78,6 @@ jobs: else make test-docker fi - workflows: version: 2 node_exporter: 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 :=