Skip to content

Commit

Permalink
Merge pull request #9641 from hakman/go1.15rc1
Browse files Browse the repository at this point in the history
Upgrade Go to version 1.15rc1
  • Loading branch information
k8s-ci-robot authored Jul 29, 2020
2 parents ebef4c8 + 2401106 commit 7f7b5b1
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 12 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
- name: Set up go
uses: actions/setup-go@v2
with:
go-version: 1.14
stable: true
go-version: 1.15.0-rc1
stable: false

- uses: actions/checkout@v2
with:
Expand All @@ -34,8 +34,8 @@ jobs:
- name: Set up go
uses: actions/setup-go@v2
with:
go-version: 1.14
stable: true
go-version: 1.15.0-rc1
stable: false

- uses: actions/checkout@v2
with:
Expand All @@ -52,8 +52,8 @@ jobs:
- name: Set up go
uses: actions/setup-go@v2
with:
go-version: 1.14
stable: true
go-version: 1.15.0-rc1
stable: false

- uses: actions/checkout@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ os:
- linux
- osx
dist: focal
go: 1.14.x
go: 1.15rc1

go_import_path: k8s.io/kops

Expand All @@ -19,6 +19,6 @@ jobs:
arch: amd64
os: linux
dist: focal
go: 1.14.x
go: 1.15rc1
script:
- GOPROXY=https://proxy.golang.org make travis-ci
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ GCS_URL=$(GCS_LOCATION:gs://%=https://storage.googleapis.com/%)
LATEST_FILE?=latest-ci.txt
GOPATH_1ST:=$(shell go env | grep GOPATH | cut -f 2 -d \")
UNIQUE:=$(shell date +%s)
GOVERSION=1.14.5
BUILD=$(KOPS_ROOT)/.build
LOCAL=$(BUILD)/local
BINDATA_TARGETS=upup/models/bindata.go
Expand Down
12 changes: 9 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,20 @@ http_archive(
],
)

load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies", "go_download_sdk")

go_rules_dependencies()

go_register_toolchains(
go_version = "1.14.5",
go_download_sdk(
name = "go_sdk",
sdks = {
"darwin_amd64": ("go1.15rc1.darwin-amd64.tar.gz", "0572e053ed5fd6e8d6ed24f62832b747d46787288e146e8ba99b574b6e0d67b0"),
"linux_amd64": ("go1.15rc1.linux-amd64.tar.gz", "ac092ebb92f88366786063e68a9531d5eccac51371f9becb128f064721731b2e"),
},
)

go_register_toolchains()

load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")

gazelle_dependencies()
Expand Down

0 comments on commit 7f7b5b1

Please sign in to comment.