From 443401d2a70515a9c42e82b743e0a1f5d09fde21 Mon Sep 17 00:00:00 2001 From: Vatsalya Goel Date: Sun, 6 Oct 2019 00:45:57 +1000 Subject: [PATCH] Upgrade go version to 1.13 (#550) Sustained Engineering --- .travis.yml | 2 +- Dockerfile | 2 +- azure-pipelines.yml | 2 +- build/azure-pipelines/integration.yml | 2 +- integrationTest/integration_test.go | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d62c7a13..143a82793 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: go go: - - 1.10.x + - 1.13.x install: pwd diff --git a/Dockerfile b/Dockerfile index 9fe6d0809..28fe1b464 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.10-alpine AS build-env +FROM golang:1.13-alpine AS build-env WORKDIR /go/src/github.com/StackExchange/dnscontrol ADD . . RUN apk update && apk add git diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3e1575505..c41106a09 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,6 +1,6 @@ variables: GOBIN: '$(GOPATH)/bin' # Go binaries path - GOROOT: '/usr/local/go1.12' # Go installation path + GOROOT: '/usr/local/go1.13' # Go installation path GOPATH: '$(system.defaultWorkingDirectory)/gopath' # Go workspace path modulePath: '$(GOPATH)/src/github.com/$(build.repository.name)' # Path to the module's code diff --git a/build/azure-pipelines/integration.yml b/build/azure-pipelines/integration.yml index d4d134d84..026fb1256 100644 --- a/build/azure-pipelines/integration.yml +++ b/build/azure-pipelines/integration.yml @@ -1,6 +1,6 @@ variables: GOBIN: '$(GOPATH)/bin' # Go binaries path - GOROOT: '/usr/local/go1.12' # Go installation path + GOROOT: '/usr/local/go1.13' # Go installation path GOPATH: '$(system.defaultWorkingDirectory)/gopath' # Go workspace path modulePath: '$(GOPATH)/src/github.com/$(build.repository.name)' # Path to the module's code wd: '$(modulePath)/integrationTest' diff --git a/integrationTest/integration_test.go b/integrationTest/integration_test.go index 02bf8eb58..654adb40c 100644 --- a/integrationTest/integration_test.go +++ b/integrationTest/integration_test.go @@ -24,6 +24,7 @@ var endIdx = flag.Int("end", 0, "Test index to stop after") var verbose = flag.Bool("verbose", false, "Print corrections as you run them") func init() { + testing.Init() flag.Parse() }