From 4ebd35e77b67c31f2ff0d9c93b4eab144d48ff2f Mon Sep 17 00:00:00 2001 From: David Gageot Date: Wed, 18 Dec 2019 17:40:43 +0100 Subject: [PATCH] Revert "Upgrade to 1.13" (#3402) This reverts commit 3c793e5111c4dd29984bb716eb1c8b918ff403e5. --- .travis.yml | 2 +- DEVELOPMENT.md | 2 +- deploy/cross/Dockerfile | 2 +- deploy/skaffold/Dockerfile | 2 +- deploy/webhook/Dockerfile | 2 +- go.mod | 2 +- go.sum | 3 --- hack/tools/go.mod | 2 +- 8 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6fea59cc8ab..1aed725f223 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ dist: xenial language: go -go: "1.13.x" +go: "1.12.x" go_import_path: /skaffold git: diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index e259f89145e..da1f549eebc 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.13) + built in (version >= go 1.12) 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 39ee0aec21c..cf62bbb9b1d 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.13.4 +FROM karalabe/xgo-1.12.13 ARG PROJECT ARG FLAG_LDFLAGS diff --git a/deploy/skaffold/Dockerfile b/deploy/skaffold/Dockerfile index 0b19ca3894a..767e8ea0c39 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.13 /usr/local/go /usr/local/go +COPY --from=golang:1.12 /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 59f24bdc3fb..2374c3a6481 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.13 as webhook +FROM golang:1.12 as webhook WORKDIR /skaffold COPY . . RUN go build -mod=vendor -o /webhook webhook/webhook.go diff --git a/go.mod b/go.mod index a15d92a5ea0..2b74bcebdad 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/GoogleContainerTools/skaffold -go 1.13 +go 1.12 replace ( github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.0.1+incompatible diff --git a/go.sum b/go.sum index 597951636d9..b43bfd985f2 100644 --- a/go.sum +++ b/go.sum @@ -388,7 +388,6 @@ github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= @@ -460,7 +459,6 @@ github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRci github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tektoncd/pipeline v0.5.1-0.20190731183258-9d7e37e85bf8 h1:NftWnvqs4oGBatJExafxwZ/GzQa2+U3CZU4QKEcmWKA= @@ -702,7 +700,6 @@ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo= gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gotest.tools v2.1.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= -gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/hack/tools/go.mod b/hack/tools/go.mod index b6f5782db1a..dbf98be3cea 100644 --- a/hack/tools/go.mod +++ b/hack/tools/go.mod @@ -1,6 +1,6 @@ module tools -go 1.13 +go 1.12 require ( github.com/corneliusweig/release-notes v0.0.0-20191014214505-0be5c7c66752