From 28c7c729360bfbc5b025a74d29de134a8fdef5c7 Mon Sep 17 00:00:00 2001 From: Tariq Ibrahim Date: Tue, 10 Sep 2019 13:38:03 -0700 Subject: [PATCH] upgrade go version to 1.13 in external-dns --- .travis.yml | 8 ++++---- Dockerfile | 2 +- Dockerfile.mini | 2 +- README.md | 1 - go.mod | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 28b1a8548..c044419d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ os: language: go go: -- "1.12.x" +- "1.13.x" - tip matrix: @@ -14,11 +14,11 @@ matrix: - go: tip env: -- GO111MODULE=on GOLANGCI_RELEASE="v1.17.1" +- GOLANGCI_RELEASE="v1.17.1" before_install: -- go get github.com/mattn/goveralls -- go get github.com/lawrencewoodman/roveralls +- GO111MODULE=off go get github.com/mattn/goveralls +- GO111MODULE=off go get github.com/lawrencewoodman/roveralls - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLANGCI_RELEASE} script: diff --git a/Dockerfile b/Dockerfile index eabbf5b02..124987fa1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # builder image -FROM golang:1.12.9 as builder +FROM golang:1.13 as builder WORKDIR /github.com/kubernetes-incubator/external-dns diff --git a/Dockerfile.mini b/Dockerfile.mini index 748b0b365..029409828 100644 --- a/Dockerfile.mini +++ b/Dockerfile.mini @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.12.9 as builder +FROM golang:1.13 as builder WORKDIR /github.com/kubernetes-incubator/external-dns diff --git a/README.md b/README.md index 6284cdd00..d8792cae9 100644 --- a/README.md +++ b/README.md @@ -162,7 +162,6 @@ support](https://github.com/golang/go/wiki/Modules#installing-and-activating-mod Assuming Go has been setup with module support it can be built simply by running: ```console -$ export GO111MODULE=on # needed if the project is checked out in your $GOPATH. $ make ``` diff --git a/go.mod b/go.mod index db42b9b90..1d807a350 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/kubernetes-incubator/external-dns -go 1.12 +go 1.13 require ( cloud.google.com/go v0.37.4