Browse Source

Build with Go 1.18 (#10501)

* Build with Go 1.18
* Update golangci-lint version

Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>
pull/10510/head
Sylvain Rabot 3 years ago committed by GitHub
parent
commit
c31a3e4c92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      .circleci/config.yml
  2. 4
      .github/workflows/golangci-lint.yml
  3. 2
      .promu.yml
  4. 2
      Makefile.common
  5. 2
      discovery/xds/kuma_test.go
  6. 2
      template/template.go

4
.circleci/config.yml

@ -11,10 +11,10 @@ executors:
# should also be updated.
golang:
docker:
- image: quay.io/prometheus/golang-builder:1.17-base
- image: quay.io/prometheus/golang-builder:1.18-base
golang_oldest:
docker:
- image: quay.io/prometheus/golang-builder:1.16-base
- image: quay.io/prometheus/golang-builder:1.17-base
jobs:
test_go:

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
.promu.yml

@ -1,7 +1,7 @@
go:
# Whenever the Go version is updated here,
# .circle/config.yml should also be updated.
version: 1.17
version: 1.18
repository:
path: github.com/prometheus/prometheus
build:

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))

2
discovery/xds/kuma_test.go

@ -31,7 +31,7 @@ import (
)
var (
kumaConf KumaSDConfig = sdConf
kumaConf = sdConf
testKumaMadsV1Resources = []*MonitoringAssignment{
{

2
template/template.go

@ -179,7 +179,7 @@ func NewTemplateExpander(
return html_template.HTML(text)
},
"match": regexp.MatchString,
"title": strings.Title,
"title": strings.Title, // nolint:staticcheck
"toUpper": strings.ToUpper,
"toLower": strings.ToLower,
"graphLink": strutil.GraphLinkForExpression,

Loading…
Cancel
Save