From 38af019113c63e9040fe76d12d4a42ea5a0a8947 Mon Sep 17 00:00:00 2001 From: Cody Soyland Date: Fri, 22 Mar 2019 17:06:17 -0500 Subject: [PATCH] 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