Skip to content

Commit 98fbd99

Browse files
authored
Merge pull request #952 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2 parents dbf420e + 70a41d5 commit 98fbd99

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2.1
22
orbs:
33
go: circleci/[email protected]
4-
prometheus: prometheus/prometheus@0.11.0
4+
prometheus: prometheus/prometheus@0.15.0
55
jobs:
66
test:
77
parameters:

.github/workflows/golangci-lint.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ on:
77
- "**.go"
88
- "scripts/errcheck_excludes.txt"
99
- ".github/workflows/golangci-lint.yml"
10+
- ".golangci.yml"
1011
pull_request:
1112
paths:
1213
- "go.sum"
1314
- "go.mod"
1415
- "**.go"
1516
- "scripts/errcheck_excludes.txt"
1617
- ".github/workflows/golangci-lint.yml"
18+
- ".golangci.yml"
1719

1820
jobs:
1921
golangci:

Makefile.common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ ifneq ($(shell which gotestsum),)
7878
endif
7979
endif
8080

81-
PROMU_VERSION ?= 0.12.0
81+
PROMU_VERSION ?= 0.13.0
8282
PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz
8383

8484
GOLANGCI_LINT :=

0 commit comments

Comments
 (0)