diff --git a/.travis.yml b/.travis.yml index f22a5e2bf4fb..60b85161f611 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ os: linux language: go go: - - 1.13.9 + - 1.14.4 env: global: - GOPROXY=https://proxy.golang.org @@ -11,7 +11,7 @@ matrix: include: - language: go name: Code Lint - go: 1.13.9 + go: 1.14.4 env: - TESTSUITE=lintall before_install: @@ -20,7 +20,7 @@ matrix: - language: go name: Unit Test - go: 1.13.9 + go: 1.14.4 env: - TESTSUITE=unittest before_install: @@ -29,7 +29,7 @@ matrix: - language: go name: Build - go: 1.13.9 + go: 1.14.4 script: make after_success: - bash <(curl -s https://codecov.io/bash) diff --git a/Makefile b/Makefile index 689c93354791..d23f765393d8 100755 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) RPM_VERSION ?= $(DEB_VERSION) # used by hack/jenkins/release_build_and_upload.sh and KVM_BUILD_IMAGE, see also BUILD_IMAGE below -GO_VERSION ?= 1.13.9 +GO_VERSION ?= 1.14.4 INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1) BUILDROOT_BRANCH ?= 2019.02.11 @@ -41,8 +41,8 @@ COMMIT ?= $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO HYPERKIT_BUILD_IMAGE ?= karalabe/xgo-1.12.x # NOTE: "latest" as of 2020-05-13. kube-cross images aren't updated as often as Kubernetes -# https://github.com/kubernetes/kubernetes/blob/release-1.18/build/build-image/cross/VERSION -BUILD_IMAGE ?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-5 +# https://github.com/kubernetes/kubernetes/blob/master/build/build-image/cross/VERSION +BUILD_IMAGE ?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-2 ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image KVM_BUILD_IMAGE ?= $(REGISTRY)/kvm-build-image:$(GO_VERSION) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index 943048421c89..3add7c710a22 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -31,7 +31,7 @@ export KUBECONFIG="${TEST_HOME}/kubeconfig" export PATH=$PATH:"/usr/local/bin/:/usr/local/go/bin/:$GOPATH/bin" # installing golang so we could do go get for gopogh -sudo ./installers/check_install_golang.sh "1.13.9" "/usr/local" || true +sudo ./installers/check_install_golang.sh "1.14.4" "/usr/local" || true docker rm -f -v $(docker ps -aq) >/dev/null 2>&1 || true docker volume prune -f || true