From 0c532984b7a6a00d67de07a9794aacfeec2c11d3 Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Sun, 3 May 2020 21:48:28 +0200 Subject: [PATCH] Finish the update to go 1.14 (#1696) * Finish the update to go 1.14 Signed-off-by: Julien Pivotto --- .circleci/config.yml | 8 ++++---- .promu-cgo.yml | 3 +++ .promu.yml | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 782593fd..19c0f1ba 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,11 +2,11 @@ version: 2.1 orbs: - prometheus: prometheus/prometheus@0.1.0 + prometheus: prometheus/prometheus@0.4.0 executors: - # Whenever the Go version is updated here, .promu.yml should - # also be updated. + # Whenever the Go version is updated here, .promu.yml and .promu-cgo.yml + # should also be updated. golang: docker: - image: circleci/golang:1.14 @@ -35,7 +35,7 @@ jobs: image: ubuntu-1604:201903-01 environment: - DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.13-base + DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.14-base REPO_PATH: github.com/prometheus/node_exporter steps: diff --git a/.promu-cgo.yml b/.promu-cgo.yml index a4e0a3cb..00bfed45 100644 --- a/.promu-cgo.yml +++ b/.promu-cgo.yml @@ -1,4 +1,7 @@ go: + # Whenever the Go version is updated here, .circle/config.yml and + # .promu.yml should also be updated. + version: 1.14 cgo: true repository: path: github.com/prometheus/node_exporter diff --git a/.promu.yml b/.promu.yml index df0256e0..5df5e7a7 100644 --- a/.promu.yml +++ b/.promu.yml @@ -1,6 +1,6 @@ go: - # Whenever the Go version is updated here, .circle/config.yml should - # also be updated. + # Whenever the Go version is updated here, .circle/config.yml and + # .promu-cgo.yml should also be updated. version: 1.14 repository: path: github.com/prometheus/node_exporter