Skip to content

Commit 7d996b6

Browse files
authored
Update common Prometheus files (#554)
Signed-off-by: prombot <[email protected]>
1 parent eaae0a7 commit 7d996b6

File tree

3 files changed

+9
-18
lines changed

3 files changed

+9
-18
lines changed

.circleci/config.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
11
---
22
version: 2.1
3-
43
orbs:
5-
prometheus: prometheus/[email protected]
6-
4+
prometheus: prometheus/[email protected]
75
executors:
86
# This must match .promu.yml.
97
golang:
108
docker:
119
- image: circleci/golang:1.17
12-
1310
jobs:
1411
test:
1512
executor: golang
16-
1713
steps:
1814
- prometheus/setup_environment
1915
- run: make
2016
- prometheus/store_artifact:
2117
file: elasticsearch_exporter
22-
2318
workflows:
2419
version: 2
2520
elasticsearch_exporter:

.github/workflows/golangci-lint.yml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,19 @@ on:
99
- ".github/workflows/golangci-lint.yml"
1010
- ".golangci.yml"
1111
pull_request:
12-
paths:
13-
- "go.sum"
14-
- "go.mod"
15-
- "**.go"
16-
- "scripts/errcheck_excludes.txt"
17-
- ".github/workflows/golangci-lint.yml"
18-
- ".golangci.yml"
1912

2013
jobs:
2114
golangci:
2215
name: lint
2316
runs-on: ubuntu-latest
2417
steps:
2518
- name: Checkout repository
26-
uses: actions/checkout@v2
27-
19+
uses: actions/checkout@v3
20+
- name: install Go
21+
uses: actions/setup-go@v2
22+
with:
23+
go-version: 1.17.x
2824
- name: Lint
29-
uses: golangci/golangci-lint-action@v2
25+
uses: golangci/golangci-lint-action@v3.1.0
3026
with:
31-
version: v1.42.0
27+
version: v1.44.2

Makefile.common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_
8383

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

0 commit comments

Comments
 (0)