diff --git a/.circleci/config.yml b/.circleci/config.yml index 8789fa1fa..baac1dea4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ executors: parameters: version: type: string - default: "1.14.9" + default: "1.14.10" resource_class: type: string default: medium @@ -84,7 +84,7 @@ jobs: default: medium golang_version: type: string - default: "1.14.9" + default: "1.14.10" shard_width: type: string default: "20" @@ -201,9 +201,9 @@ workflows: tags: only: /^v.*/ - test: - name: test-golang-1.14.9 + name: test-golang-1.14.10 resource_class: xlarge - golang_version: 1.14.9 + golang_version: 1.14.10 requires: - setup filters: @@ -216,7 +216,7 @@ workflows: # name: test-golang-<< matrix.golang_version >> # matrix: # parameters: - # golang_version: ["1.14.9", "1.15.3"] + # golang_version: ["1.14.10", "1.15.3"] - test: name: test-race test_make_target: test-race @@ -248,7 +248,7 @@ workflows: requires: - linter - check-license-headers - - test-golang-1.14.9 + - test-golang-1.14.10 - dockerhub-upload-unstable: context: molecula requires: diff --git a/Dockerfile b/Dockerfile index 33df2d063..06a9811d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.3 as builder +FROM golang:1.14.10 as builder ARG BUILD_FLAGS ARG MAKE_FLAGS diff --git a/Makefile b/Makefile index b3af9212a..d6e1caec8 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ BUILD_TIME := $(shell date -u +%FT%T%z) SHARD_WIDTH = 20 COMMIT := $(shell git describe --exact-match >/dev/null 2>&1 || git rev-parse --short HEAD) LDFLAGS="-X github.com/pilosa/pilosa/v2.Version=$(VERSION) -X github.com/pilosa/pilosa/v2.BuildTime=$(BUILD_TIME) -X github.com/pilosa/pilosa/v2.Variant=$(VARIANT) -X github.com/pilosa/pilosa/v2.Commit=$(COMMIT) -X github.com/pilosa/pilosa/v2.LatticeCommit=$(LATTICE_COMMIT)" -GO_VERSION=1.14.9 +GO_VERSION=1.14.10 RELEASE ?= 0 RELEASE_ENABLED = $(subst 0,,$(RELEASE)) BUILD_TAGS += $(if $(RELEASE_ENABLED),release)