mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-24 21:24:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Build with Go 1.17

Browse source 
Update build to use Go 1.17.
* Use golang-builder images for testing.
* Update CircleCI go orb.
* Use tools from golang-builder image.

Signed-off-by: SuperQ <superq@gmail.com>
This commit is contained in:
SuperQ 2021-08-25 16:24:42 +02:00
parent 1276aaaa9f
commit a1401c26b1
No known key found for this signature in database
GPG key ID: C646B23C9E3245F1
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.circleci/config.yml
View file

@ -3,7 +3,7 @@ version: 2.1
orbs: orbs:
prometheus: prometheus/prometheus@0.11.0 prometheus: prometheus/prometheus@0.11.0
go: circleci/go@0.2.0 go: circleci/go@1.7.0
win: circleci/windows@2.3.0 win: circleci/windows@2.3.0
executors: executors:
@ -11,10 +11,10 @@ executors:
# should also be updated. # should also be updated.
golang: golang:
docker: docker:
- image: circleci/golang:1.16-node - image: quay.io/prometheus/golang-builder:1.17-base
golang_115: golang_115:
docker: docker:
- image: circleci/golang:1.15-node - image: quay.io/prometheus/golang-builder:1.15-base
jobs: jobs:
test_go: test_go:
@ -24,8 +24,6 @@ jobs:
- prometheus/setup_environment - prometheus/setup_environment
- go/load-cache: - go/load-cache:
key: v1 key: v1
- run:
command: sudo apt-get install -y yamllint
- run: - run:
command: make GO_ONLY=1 command: make GO_ONLY=1
environment: environment:
@ -110,14 +108,12 @@ jobs:
- run: - run:
command: go install -mod=readonly github.com/google/go-jsonnet/cmd/jsonnet github.com/google/go-jsonnet/cmd/jsonnetfmt github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb command: go install -mod=readonly github.com/google/go-jsonnet/cmd/jsonnet github.com/google/go-jsonnet/cmd/jsonnetfmt github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb
working_directory: ~/project/documentation/prometheus-mixin working_directory: ~/project/documentation/prometheus-mixin
- run: -8716766cb49ab9dd7df5622d80bb217b94a21d0f3d3dc3d074c3ec7a0c7f67ea run:
command: make clean command: make clean
working_directory: ~/project/documentation/prometheus-mixin working_directory: ~/project/documentation/prometheus-mixin
- run: - run:
command: jb install command: jb install
working_directory: ~/project/documentation/prometheus-mixin working_directory: ~/project/documentation/prometheus-mixin
- run:
command: sudo apt-get install -y yamllint
- run: - run:
command: make command: make
working_directory: ~/project/documentation/prometheus-mixin working_directory: ~/project/documentation/prometheus-mixin
@ -129,8 +125,6 @@ jobs:
executor: golang executor: golang
steps: steps:
- checkout - checkout
- run: mkdir -v -p "${PATH%%:*}" && curl -sL --fail https://github.com/mikefarah/yq/releases/download/v4.6.3/yq_linux_amd64 -o "${PATH%%:*}/yq" && chmod -v +x "${PATH%%:*}/yq"
- run: sha256sum -c <(echo "c4343783c3361495c0d6d1eb742bba7432aa65e13e9fb8d7e201d544bcf14246 ${PATH%%:*}/yq")
- run: ./scripts/sync_repo_files.sh - run: ./scripts/sync_repo_files.sh
workflows: workflows:

2
.promu.yml
View file

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