mirror of
https://github.com/prometheus/prometheus.git
synced 2025-03-05 20:59:13 -08:00
*: move to go 1.11 (#4626)
* *: move to go 1.11 Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Reduce number of places where we specify the Go version Signed-off-by: Simon Pasquier <spasquie@redhat.com>
This commit is contained in:
parent
1098ed89d8
commit
c4a6acfb1e
|
@ -1,13 +1,17 @@
|
||||||
---
|
---
|
||||||
version: 2.1
|
version: 2.1
|
||||||
|
|
||||||
|
executors:
|
||||||
|
# Whenever the Go version is updated here, .travis.yml and .promu.yml
|
||||||
|
# should also be updated.
|
||||||
|
golang:
|
||||||
|
docker:
|
||||||
|
- image: circleci/golang:1.11
|
||||||
|
working_directory: /go/src/github.com/prometheus/prometheus
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
# Whenever the Go version is updated here, .travis.yml should also be
|
executor: golang
|
||||||
# updated.
|
|
||||||
docker:
|
|
||||||
- image: circleci/golang:1.10
|
|
||||||
working_directory: /go/src/github.com/prometheus/prometheus
|
|
||||||
resource_class: large
|
resource_class: large
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
@ -24,7 +28,6 @@ jobs:
|
||||||
|
|
||||||
build:
|
build:
|
||||||
machine: true
|
machine: true
|
||||||
working_directory: /home/circleci/.go_workspace/src/github.com/prometheus/prometheus
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
|
@ -39,9 +42,7 @@ jobs:
|
||||||
destination: /build
|
destination: /build
|
||||||
|
|
||||||
docker_hub_master:
|
docker_hub_master:
|
||||||
docker:
|
executor: golang
|
||||||
- image: circleci/golang:1.10
|
|
||||||
working_directory: /go/src/github.com/prometheus/prometheus
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
|
@ -59,9 +60,7 @@ jobs:
|
||||||
- run: make docker-publish DOCKER_REPO=quay.io/prometheus
|
- run: make docker-publish DOCKER_REPO=quay.io/prometheus
|
||||||
|
|
||||||
docker_hub_release_tags:
|
docker_hub_release_tags:
|
||||||
docker:
|
executor: golang
|
||||||
- image: circleci/golang:1.10
|
|
||||||
working_directory: /go/src/github.com/prometheus/prometheus
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
|
|
|
@ -1,3 +1,7 @@
|
||||||
|
go:
|
||||||
|
# Whenever the Go version is updated here, .travis.yml and
|
||||||
|
# .circle/config.yml should also be updated.
|
||||||
|
version: 1.11
|
||||||
repository:
|
repository:
|
||||||
path: github.com/prometheus/prometheus
|
path: github.com/prometheus/prometheus
|
||||||
build:
|
build:
|
||||||
|
|
|
@ -2,10 +2,10 @@ sudo: false
|
||||||
|
|
||||||
language: go
|
language: go
|
||||||
|
|
||||||
# Whenever the Go version is updated here, .circleci/config.yml should also be
|
# Whenever the Go version is updated here, .circleci/config.yml and .promu.yml
|
||||||
# updated.
|
# should also be updated.
|
||||||
go:
|
go:
|
||||||
- 1.10.x
|
- 1.11.x
|
||||||
|
|
||||||
go_import_path: github.com/prometheus/prometheus
|
go_import_path: github.com/prometheus/prometheus
|
||||||
|
|
||||||
|
|
4
Makefile
4
Makefile
|
@ -18,8 +18,10 @@ STATICCHECK_IGNORE = \
|
||||||
github.com/prometheus/prometheus/discovery/kubernetes/node.go:SA1019 \
|
github.com/prometheus/prometheus/discovery/kubernetes/node.go:SA1019 \
|
||||||
github.com/prometheus/prometheus/documentation/examples/remote_storage/remote_storage_adapter/main.go:SA1019 \
|
github.com/prometheus/prometheus/documentation/examples/remote_storage/remote_storage_adapter/main.go:SA1019 \
|
||||||
github.com/prometheus/prometheus/pkg/textparse/lex.l.go:SA4006 \
|
github.com/prometheus/prometheus/pkg/textparse/lex.l.go:SA4006 \
|
||||||
|
github.com/prometheus/prometheus/pkg/textparse/lex.l.go:SA4006 \
|
||||||
github.com/prometheus/prometheus/pkg/pool/pool.go:SA6002 \
|
github.com/prometheus/prometheus/pkg/pool/pool.go:SA6002 \
|
||||||
github.com/prometheus/prometheus/promql/engine.go:SA6002
|
github.com/prometheus/prometheus/promql/engine.go:SA6002 \
|
||||||
|
github.com/prometheus/prometheus/prompb/rpc.pb.gw.go:SA1019
|
||||||
|
|
||||||
DOCKER_IMAGE_NAME ?= prometheus
|
DOCKER_IMAGE_NAME ?= prometheus
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue