Skip to content

Commit 5df15f6

Browse files
authored
Merge pull request #8660 from RA489/go-v1.14.4
Upgrade go version to 1.14.4
2 parents 87e5403 + 39a4268 commit 5df15f6

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.travis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
os: linux
44
language: go
55
go:
6-
- 1.13.9
6+
- 1.14.4
77
env:
88
global:
99
- GOPROXY=https://proxy.golang.org
1010
matrix:
1111
include:
1212
- language: go
1313
name: Code Lint
14-
go: 1.13.9
14+
go: 1.14.4
1515
env:
1616
- TESTSUITE=lintall
1717
before_install:
@@ -20,7 +20,7 @@ matrix:
2020

2121
- language: go
2222
name: Unit Test
23-
go: 1.13.9
23+
go: 1.14.4
2424
env:
2525
- TESTSUITE=unittest
2626
before_install:
@@ -29,7 +29,7 @@ matrix:
2929

3030
- language: go
3131
name: Build
32-
go: 1.13.9
32+
go: 1.14.4
3333
script: make
3434
after_success:
3535
- bash <(curl -s https://codecov.io/bash)

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
2929
RPM_VERSION ?= $(DEB_VERSION)
3030

3131
# used by hack/jenkins/release_build_and_upload.sh and KVM_BUILD_IMAGE, see also BUILD_IMAGE below
32-
GO_VERSION ?= 1.13.9
32+
GO_VERSION ?= 1.14.4
3333

3434
INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1)
3535
BUILDROOT_BRANCH ?= 2019.02.11
@@ -41,8 +41,8 @@ COMMIT ?= $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO
4141

4242
HYPERKIT_BUILD_IMAGE ?= karalabe/xgo-1.12.x
4343
# NOTE: "latest" as of 2020-05-13. kube-cross images aren't updated as often as Kubernetes
44-
# https://github.com/kubernetes/kubernetes/blob/release-1.18/build/build-image/cross/VERSION
45-
BUILD_IMAGE ?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-5
44+
# https://github.com/kubernetes/kubernetes/blob/master/build/build-image/cross/VERSION
45+
BUILD_IMAGE ?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-2
4646
ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image
4747
KVM_BUILD_IMAGE ?= $(REGISTRY)/kvm-build-image:$(GO_VERSION)
4848

hack/jenkins/common.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export KUBECONFIG="${TEST_HOME}/kubeconfig"
3131
export PATH=$PATH:"/usr/local/bin/:/usr/local/go/bin/:$GOPATH/bin"
3232

3333
# installing golang so we could do go get for gopogh
34-
sudo ./installers/check_install_golang.sh "1.13.9" "/usr/local" || true
34+
sudo ./installers/check_install_golang.sh "1.14.4" "/usr/local" || true
3535

3636
docker rm -f -v $(docker ps -aq) >/dev/null 2>&1 || true
3737
docker volume prune -f || true

0 commit comments

Comments
 (0)