mirror of
https://github.com/featurebasedb/featurebase.git
synced 2026-09-05 08:10:50 +00:00
Merge pull request #1038 from jaten-molecula/dockerfile_go1.14.10
use go1.14.10 for now because of https://github.com/molecula/pilosa/issues/1036
This commit is contained in:
commit
7855cd4d21
3 changed files with 8 additions and 8 deletions
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
FROM golang:1.15.3 as builder
|
||||
FROM golang:1.14.10 as builder
|
||||
|
||||
ARG BUILD_FLAGS
|
||||
ARG MAKE_FLAGS
|
||||
|
|
|
|||
2
Makefile
2
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)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue