From 20137986e5c42ba6aa4de93f680ce1db83ec4f8a Mon Sep 17 00:00:00 2001 From: Cody Soyland Date: Fri, 22 Mar 2019 16:41:33 -0500 Subject: [PATCH 1/3] Add Go 1.12 to CircleCI --- .circleci/config.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index e505ae621..d6cbf46d0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,6 +38,16 @@ jobs: - run: make build GOOS=linux GOARCH=arm GOARM=6 - run: make build GOOS=linux GOARCH=arm GOARM=7 - run: make build GOOS=linux GOARCH=arm64 + test-golang-1.12: &base-test + working_directory: /go/src/github.com/pilosa/pilosa + docker: + - image: circleci/golang:1.12 + environment: + GO111MODULE: "on" + steps: + - *fast-checkout + - run: sudo apt-get install lsof + - run: make test test-golang-1.11: &base-test <<: *defaults steps: @@ -112,6 +122,9 @@ workflows: - test-build-arm: requires: - setup + - test-golang-1.12: + requires: + - setup - test-golang-1.11: requires: - setup From 38af019113c63e9040fe76d12d4a42ea5a0a8947 Mon Sep 17 00:00:00 2001 From: Cody Soyland Date: Fri, 22 Mar 2019 17:06:17 -0500 Subject: [PATCH 2/3] Default to Go 1.12 --- .circleci/config.yml | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d6cbf46d0..3ceebeb05 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 defaults: &defaults working_directory: /go/src/github.com/pilosa/pilosa docker: - - image: circleci/golang:1.11 + - image: circleci/golang:1.12 environment: GO111MODULE: "on" fast-checkout: &fast-checkout @@ -39,22 +39,12 @@ jobs: - run: make build GOOS=linux GOARCH=arm GOARM=7 - run: make build GOOS=linux GOARCH=arm64 test-golang-1.12: &base-test - working_directory: /go/src/github.com/pilosa/pilosa - docker: - - image: circleci/golang:1.12 - environment: - GO111MODULE: "on" - steps: - - *fast-checkout - - run: sudo apt-get install lsof - - run: make test - test-golang-1.11: &base-test <<: *defaults steps: - *fast-checkout - run: sudo apt-get install lsof - run: make test - test-golang-1.11-race: + test-golang-1.12-race: <<: *defaults steps: - *fast-checkout @@ -62,11 +52,19 @@ jobs: - run: command: make test TESTFLAGS="-race -v -timeout=30m" no_output_timeout: 30m - test-golang-1.11-386: + test-golang-1.12-386: <<: *base-test environment: GO111MODULE: "on" GOARCH: 386 + test-golang-1.11: + <<: *defaults + docker: + - image: circleci/golang:1.11 + steps: + - *fast-checkout + - run: sudo apt-get install lsof + - run: make test cluster-tests: <<: *defaults steps: @@ -125,15 +123,15 @@ workflows: - test-golang-1.12: requires: - setup + - test-golang-1.12-race: + requires: + - setup + - test-golang-1.12-386: + requires: + - setup - test-golang-1.11: requires: - setup - - test-golang-1.11-race: - requires: - - setup - - test-golang-1.11-386: - requires: - - setup - cluster-tests: requires: - setup From 3096202980fb66ab370fb62001daa196360096f4 Mon Sep 17 00:00:00 2001 From: Cody Soyland Date: Fri, 22 Mar 2019 17:20:08 -0500 Subject: [PATCH 3/3] Make workflow require Go 1.12, not Go 1.11 --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3ceebeb05..c696d5691 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -138,11 +138,11 @@ workflows: - prerelease: requires: - linter - - test-golang-1.11 + - test-golang-1.12 - release: requires: - linter - - test-golang-1.11 + - test-golang-1.12 filters: tags: only: /^v.*/ @@ -154,4 +154,4 @@ workflows: - dockerhub-upload: requires: - linter - - test-golang-1.11 + - test-golang-1.12