Browse Source

Merge pull request #2334 from prometheus/repo_sync

Synchronize common files from prometheus/prometheus
pull/2354/head
Ben Kochie 3 years ago committed by GitHub
parent
commit
19e4a2352f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      .github/workflows/golangci-lint.yml
  2. 2
      Makefile.common

4
.github/workflows/golangci-lint.yml

@ -20,8 +20,8 @@ jobs:
- name: install Go
uses: actions/setup-go@v2
with:
go-version: 1.17.x
go-version: 1.18.x
- name: Lint
uses: golangci/golangci-lint-action@v3.1.0
with:
version: v1.44.2
version: v1.45.2

2
Makefile.common

@ -83,7 +83,7 @@ PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_
GOLANGCI_LINT :=
GOLANGCI_LINT_OPTS ?=
GOLANGCI_LINT_VERSION ?= v1.44.2
GOLANGCI_LINT_VERSION ?= v1.45.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))

Loading…
Cancel
Save