Browse Source

Update common Prometheus files (#2214)

Signed-off-by: prombot <prometheus-team@googlegroups.com>
pull/2222/head
PrometheusBot 3 years ago committed by GitHub
parent
commit
9fbb56c9c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 16
      .circleci/config.yml
  2. 2
      Makefile.common

16
.circleci/config.yml

@ -1,36 +1,29 @@
--- ---
version: 2.1 version: 2.1
orbs: orbs:
prometheus: prometheus/prometheus@0.11.0 prometheus: prometheus/prometheus@0.14.0
executors: executors:
# Whenever the Go version is updated here, .promu.yml and .promu-cgo.yml # Whenever the Go version is updated here, .promu.yml and .promu-cgo.yml
# should also be updated. # should also be updated.
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: go mod download - run: go mod download
- run: make - run: make
- prometheus/store_artifact: - prometheus/store_artifact:
file: node_exporter file: node_exporter
codespell: codespell:
docker: docker:
- image: circleci/python - image: circleci/python
steps: steps:
- checkout - checkout
- run: sudo pip install codespell - run: sudo pip install codespell
- run: codespell --skip=".git,./vendor,ttar,go.mod,go.sum,*pem,./collector/fixtures" -L uint,packages\',uptodate - run: codespell --skip=".git,./vendor,ttar,go.mod,go.sum,*pem,./collector/fixtures" -L uint,packages\',uptodate
test_mixins: test_mixins:
executor: golang executor: golang
steps: steps:
@ -43,13 +36,10 @@ jobs:
- run: make -C docs/node-mixin jb_install - run: make -C docs/node-mixin jb_install
- run: make -C docs/node-mixin - run: make -C docs/node-mixin
- run: git diff --exit-code - run: git diff --exit-code
build: build:
machine: machine:
image: ubuntu-2004:202101-01 image: ubuntu-2004:202101-01
parallelism: 3 parallelism: 3
steps: steps:
- prometheus/setup_environment - prometheus/setup_environment
- run: docker run --privileged linuxkit/binfmt:v0.8 - run: docker run --privileged linuxkit/binfmt:v0.8
@ -62,15 +52,12 @@ jobs:
- store_artifacts: - store_artifacts:
path: .build path: .build
destination: /build destination: /build
test_docker: test_docker:
machine: machine:
image: ubuntu-2004:202101-01 image: ubuntu-2004:202101-01
environment: environment:
DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.16-base DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.16-base
REPO_PATH: github.com/prometheus/node_exporter REPO_PATH: github.com/prometheus/node_exporter
steps: steps:
- prometheus/setup_environment - prometheus/setup_environment
- attach_workspace: - attach_workspace:
@ -91,7 +78,6 @@ jobs:
else else
make test-docker make test-docker
fi fi
workflows: workflows:
version: 2 version: 2
node_exporter: node_exporter:

2
Makefile.common

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

Loading…
Cancel
Save