kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9641 from hakman/go1.15rc1 

Upgrade Go to version 1.15rc1
This commit is contained in:
Kubernetes Prow Robot 2020-07-28 21:23:47 -07:00 committed by GitHub
parent ebef4c8ad5 2401106ebb
commit 7f7b5b1782
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/main.yml vendored
View File

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

4
.travis.yml
View File

@ -6,7 +6,7 @@ os:
- linux - linux
- osx - osx
dist: focal dist: focal
go: 1.14.x go: 1.15rc1
go_import_path: k8s.io/kops go_import_path: k8s.io/kops
@ -19,6 +19,6 @@ jobs:
arch: amd64 arch: amd64
os: linux os: linux
dist: focal dist: focal
go: 1.14.x go: 1.15rc1
script: script:
- GOPROXY=https://proxy.golang.org make travis-ci - GOPROXY=https://proxy.golang.org make travis-ci

1
Makefile
View File

@ -23,7 +23,6 @@ GCS_URL=$(GCS_LOCATION:gs://%=https://storage.googleapis.com/%)
LATEST_FILE?=latest-ci.txt LATEST_FILE?=latest-ci.txt
GOPATH_1ST:=$(shell go env | grep GOPATH | cut -f 2 -d \") GOPATH_1ST:=$(shell go env | grep GOPATH | cut -f 2 -d \")
UNIQUE:=$(shell date +%s) UNIQUE:=$(shell date +%s)
GOVERSION=1.14.5
BUILD=$(KOPS_ROOT)/.build BUILD=$(KOPS_ROOT)/.build
LOCAL=$(BUILD)/local LOCAL=$(BUILD)/local
BINDATA_TARGETS=upup/models/bindata.go BINDATA_TARGETS=upup/models/bindata.go

12
WORKSPACE
View File

@ -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_rules_dependencies()
go_register_toolchains( go_download_sdk(
go_version = "1.14.5", 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") load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
gazelle_dependencies() gazelle_dependencies()