Skip to content

Commit f00ae20

Browse files
authored
Merge pull request #5128 from warmchang/go1.12.9
bump to go1.12.9
2 parents e53998e + 204b394 commit f00ae20

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ env:
55
- GOPROXY=https://proxy.golang.org
66
matrix:
77
include:
8-
- go: 1.12.7
8+
- go: 1.12.9
99
- language: python
1010
before_install: pip install flake8
1111
script: flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
2323
DEB_VERSION ?= $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
2424
RPM_VERSION ?= $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
2525
# used by hack/jenkins/release_build_and_upload.sh and KVM_BUILD_IMAGE, see also BUILD_IMAGE below
26-
GO_VERSION ?= 1.12.8
26+
GO_VERSION ?= 1.12.9
2727

2828
INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1)
2929
BUILDROOT_BRANCH ?= 2018.05.3
@@ -101,7 +101,7 @@ SOURCE_DIRS = $(CMD_SOURCE_DIRS) test
101101
SOURCE_PACKAGES = ./cmd/... ./pkg/... ./test/...
102102

103103
# kvm2 ldflags
104-
KVM2_LDFLAGS := -X k8s.io/minikube/pkg/drivers/kvm.version=$(VERSION) -X k8s.io/minikube/pkg/drivers/kvm.gitCommitID=$(COMMIT)
104+
KVM2_LDFLAGS := -X k8s.io/minikube/pkg/drivers/kvm.version=$(VERSION) -X k8s.io/minikube/pkg/drivers/kvm.gitCommitID=$(COMMIT)
105105

106106
# hyperkit ldflags
107107
HYPERKIT_LDFLAGS := -X k8s.io/minikube/pkg/drivers/hyperkit.version=$(VERSION) -X k8s.io/minikube/pkg/drivers/hyperkit.gitCommitID=$(COMMIT)

0 commit comments

Comments
 (0)