From 72f1924f57e7cbe7b2d24a8a7a64cdc7ab5d742c Mon Sep 17 00:00:00 2001 From: David Gageot Date: Thu, 12 Dec 2019 16:38:30 +0100 Subject: [PATCH] Upgrade to 1.13 --- .travis.yml | 2 +- DEVELOPMENT.md | 2 +- deploy/cross/Dockerfile | 3 ++- deploy/skaffold/Dockerfile | 2 +- deploy/webhook/Dockerfile | 2 +- go.mod | 2 +- hack/tools/go.mod | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1aed725f223..6fea59cc8ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ dist: xenial language: go -go: "1.12.x" +go: "1.13.x" go_import_path: /skaffold git: diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index da1f549eebc..e259f89145e 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -9,7 +9,7 @@ This doc explains the development workflow so you can get started You must install these tools: 1. [`go`](https://golang.org/doc/install): The language skaffold is - built in (version >= go 1.12) + built in (version >= go 1.13) 1. [`git`](https://help.github.com/articles/set-up-git/): For source control 1. [`make`](https://www.gnu.org/software/make/): For building skaffold. 1. [`golangci-lint`](https://github.com/golangci/golangci-lint): You can use the diff --git a/deploy/cross/Dockerfile b/deploy/cross/Dockerfile index cf62bbb9b1d..a3dcb98828b 100644 --- a/deploy/cross/Dockerfile +++ b/deploy/cross/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM karalabe/xgo-1.12.13 +FROM karalabe/xgo-1.13.4 ARG PROJECT ARG FLAG_LDFLAGS @@ -24,6 +24,7 @@ ENV EXT_GOPATH /ext-go ENV FLAG_LDFLAGS $FLAG_LDFLAGS ENV TARGETS $TARGETS ENV FLAG_TAGS $FLAG_TAGS +ENV GO111MODULE off WORKDIR /ext-go/src/$PROJECT COPY . . diff --git a/deploy/skaffold/Dockerfile b/deploy/skaffold/Dockerfile index 767e8ea0c39..0b19ca3894a 100644 --- a/deploy/skaffold/Dockerfile +++ b/deploy/skaffold/Dockerfile @@ -117,7 +117,7 @@ RUN apt-get update && apt-get install --no-install-recommends --no-install-sugge jq \ apt-transport-https && \ rm -rf /var/lib/apt/lists/* -COPY --from=golang:1.12 /usr/local/go /usr/local/go +COPY --from=golang:1.13 /usr/local/go /usr/local/go ENV PATH /usr/local/go/bin:/root/go/bin:$PATH WORKDIR /skaffold COPY . . diff --git a/deploy/webhook/Dockerfile b/deploy/webhook/Dockerfile index 2374c3a6481..59f24bdc3fb 100644 --- a/deploy/webhook/Dockerfile +++ b/deploy/webhook/Dockerfile @@ -44,7 +44,7 @@ COPY --from=download-docsy /docsy ./themes/docsy COPY --from=download-hugo /hugo /usr/local/bin/ COPY --from=download-kubectl /kubectl /usr/local/bin/ -FROM golang:1.12 as webhook +FROM golang:1.13 as webhook WORKDIR /skaffold COPY . . RUN go build -mod=vendor -o /webhook webhook/webhook.go diff --git a/go.mod b/go.mod index 2b74bcebdad..a15d92a5ea0 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/GoogleContainerTools/skaffold -go 1.12 +go 1.13 replace ( github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.0.1+incompatible diff --git a/hack/tools/go.mod b/hack/tools/go.mod index dbf98be3cea..b6f5782db1a 100644 --- a/hack/tools/go.mod +++ b/hack/tools/go.mod @@ -1,6 +1,6 @@ module tools -go 1.12 +go 1.13 require ( github.com/corneliusweig/release-notes v0.0.0-20191014214505-0be5c7c66752