re
/
client_golang
forked from mirror/client_golang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #952 from prometheus/repo_sync 

Synchronize common files from prometheus/prometheus
This commit is contained in:
Kemal Akkoyun 2021-12-21 08:41:18 +00:00 committed by GitHub
parent dbf420e7ce 70a41d58f8
commit 98fbd996b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -1,7 +1,7 @@
version: 2.1 version: 2.1
orbs: orbs:
go: circleci/go@0.2.0 go: circleci/go@0.2.0
prometheus: prometheus/prometheus@0.11.0 prometheus: prometheus/prometheus@0.15.0
jobs: jobs:
test: test:
parameters: parameters:

2
.github/workflows/golangci-lint.yml vendored
View File

@ -7,6 +7,7 @@ on:
- "**.go" - "**.go"
- "scripts/errcheck_excludes.txt" - "scripts/errcheck_excludes.txt"
- ".github/workflows/golangci-lint.yml" - ".github/workflows/golangci-lint.yml"
- ".golangci.yml"
pull_request: pull_request:
paths: paths:
- "go.sum" - "go.sum"
@ -14,6 +15,7 @@ on:
- "**.go" - "**.go"
- "scripts/errcheck_excludes.txt" - "scripts/errcheck_excludes.txt"
- ".github/workflows/golangci-lint.yml" - ".github/workflows/golangci-lint.yml"
- ".golangci.yml"
jobs: jobs:
golangci: golangci:

2
Makefile.common
View File

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