Skip to content

Commit

Permalink
Update common Prometheus files (#554)
Browse files Browse the repository at this point in the history
Signed-off-by: prombot <[email protected]>
  • Loading branch information
prombot authored Mar 18, 2022
1 parent eaae0a7 commit 7d996b6
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 18 deletions.
7 changes: 1 addition & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,20 @@
---
version: 2.1

orbs:
prometheus: prometheus/[email protected]

prometheus: prometheus/[email protected]
executors:
# This must match .promu.yml.
golang:
docker:
- image: circleci/golang:1.17

jobs:
test:
executor: golang

steps:
- prometheus/setup_environment
- run: make
- prometheus/store_artifact:
file: elasticsearch_exporter

workflows:
version: 2
elasticsearch_exporter:
Expand Down
18 changes: 7 additions & 11 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,19 @@ on:
- ".github/workflows/golangci-lint.yml"
- ".golangci.yml"
pull_request:
paths:
- "go.sum"
- "go.mod"
- "**.go"
- "scripts/errcheck_excludes.txt"
- ".github/workflows/golangci-lint.yml"
- ".golangci.yml"

jobs:
golangci:
name: lint
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2

uses: actions/checkout@v3
- name: install Go
uses: actions/setup-go@v2
with:
go-version: 1.17.x
- name: Lint
uses: golangci/golangci-lint-action@v2
uses: golangci/golangci-lint-action@v3.1.0
with:
version: v1.42.0
version: v1.44.2
2 changes: 1 addition & 1 deletion Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_

GOLANGCI_LINT :=
GOLANGCI_LINT_OPTS ?=
GOLANGCI_LINT_VERSION ?= v1.42.0
GOLANGCI_LINT_VERSION ?= v1.44.2
# golangci-lint only supports linux, darwin and windows platforms on i386/amd64.
# windows isn't included here because of the path separator being different.
ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))
Expand Down

0 comments on commit 7d996b6

Please sign in to comment.