From f105e5bbcee44ef867e674f8a24373f0c514adc8 Mon Sep 17 00:00:00 2001 From: francisco souza Date: Thu, 22 Aug 2019 22:08:51 -0700 Subject: [PATCH] Dockerfile, drone: Go 1.13rc1 --- Dockerfile | 4 ++-- drone/ci.jsonnet | 2 +- drone/ci.yml | 38 +++++++++++++++++++------------------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Dockerfile b/Dockerfile index f09b38a9..b680def8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM golang:1.12.9-alpine AS build +FROM golang:1.13rc1-alpine AS build -ARG GOPROXY=https://proxy.golang.org +ARG GOPROXY=https://proxy.golang.org,https://gocenter.io,direct ENV CGO_ENABLED 0 WORKDIR /code diff --git a/drone/ci.jsonnet b/drone/ci.jsonnet index 90e8d6aa..6ec85421 100644 --- a/drone/ci.jsonnet +++ b/drone/ci.jsonnet @@ -1,5 +1,5 @@ // the first version is used to build the binary that gets shipped to Docker Hub. -local go_versions = ['1.12.9', '1.11.13', '1.13beta1']; +local go_versions = ['1.13rc1', '1.12.9', '1.11.13']; local goproxy = 'https://proxy.golang.org'; diff --git a/drone/ci.yml b/drone/ci.yml index 9acb0c4f..e45ee0c9 100644 --- a/drone/ci.yml +++ b/drone/ci.yml @@ -2,7 +2,7 @@ # DO NOT MODIFY - AUTO GENERATED kind: pipeline -name: go-1.12.9 +name: go-1.13rc1 platform: os: linux @@ -14,7 +14,7 @@ workspace: steps: - name: mod-download - image: golang:1.12.9 + image: golang:1.13rc1 commands: - go mod download environment: @@ -23,12 +23,12 @@ steps: - clone - name: coverage - image: golang:1.12.9 + image: golang:1.13rc1 commands: - apt update - apt install -y redis-server - - "redis-server &>/dev/null &" - - "timeout 10 sh -c \"while ! redis-cli ping; do echo waiting for redis-server to start; sleep 1; done\"" + - redis-server &>/dev/null & + - timeout 10 sh -c "while ! redis-cli ping; do echo waiting for redis-server to start; sleep 1; done" - make gocoverage depends_on: - mod-download @@ -42,7 +42,7 @@ steps: - mod-download - name: build - image: golang:1.12.9 + image: golang:1.13rc1 commands: - make build environment: @@ -92,7 +92,7 @@ steps: from_secret: docker_username when: ref: - - "refs/tags/*" + - refs/tags/* - refs/heads/master depends_on: - coverage @@ -116,7 +116,7 @@ steps: --- kind: pipeline -name: go-1.11.13 +name: go-1.12.9 platform: os: linux @@ -128,7 +128,7 @@ workspace: steps: - name: mod-download - image: golang:1.11.13 + image: golang:1.12.9 commands: - go mod download environment: @@ -137,12 +137,12 @@ steps: - clone - name: coverage - image: golang:1.11.13 + image: golang:1.12.9 commands: - apt update - apt install -y redis-server - - "redis-server &>/dev/null &" - - "timeout 10 sh -c \"while ! redis-cli ping; do echo waiting for redis-server to start; sleep 1; done\"" + - redis-server &>/dev/null & + - timeout 10 sh -c "while ! redis-cli ping; do echo waiting for redis-server to start; sleep 1; done" - make gocoverage depends_on: - mod-download @@ -156,7 +156,7 @@ steps: - mod-download - name: build - image: golang:1.11.13 + image: golang:1.12.9 commands: - make build environment: @@ -182,7 +182,7 @@ steps: --- kind: pipeline -name: go-1.13beta1 +name: go-1.11.13 platform: os: linux @@ -194,7 +194,7 @@ workspace: steps: - name: mod-download - image: golang:1.13beta1 + image: golang:1.11.13 commands: - go mod download environment: @@ -203,12 +203,12 @@ steps: - clone - name: coverage - image: golang:1.13beta1 + image: golang:1.11.13 commands: - apt update - apt install -y redis-server - - "redis-server &>/dev/null &" - - "timeout 10 sh -c \"while ! redis-cli ping; do echo waiting for redis-server to start; sleep 1; done\"" + - redis-server &>/dev/null & + - timeout 10 sh -c "while ! redis-cli ping; do echo waiting for redis-server to start; sleep 1; done" - make gocoverage depends_on: - mod-download @@ -222,7 +222,7 @@ steps: - mod-download - name: build - image: golang:1.13beta1 + image: golang:1.11.13 commands: - make build environment: