Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Go 1.13 #3412

Merged
merged 1 commit into from
Dec 20, 2019
Merged

Upgrade to Go 1.13 #3412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dist: xenial

language: go
go: "1.12.x"
go: "1.13.x"
go_import_path: /skaffold

git:
Expand Down
2 changes: 1 addition & 1 deletion DEVELOPMENT.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion deploy/cross/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 . .
Expand Down
2 changes: 1 addition & 1 deletion deploy/skaffold/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 . .
Expand Down
2 changes: 1 addition & 1 deletion deploy/webhook/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion hack/tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module tools

go 1.12
go 1.13

require (
github.com/corneliusweig/release-notes v0.0.0-20191014214505-0be5c7c66752
Expand Down