From 6adf11a888bbd8276afb4a5778969d28ddf80e25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sun, 28 Jun 2020 20:32:44 +0200 Subject: [PATCH 1/2] Upgrade golang version from 1.13.8 to 1.13.9 --- .travis.yml | 8 ++++---- Makefile | 7 ++++--- hack/jenkins/common.sh | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 61fb1ef1f7..f22a5e2bf4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ os: linux language: go go: - - 1.13.8 + - 1.13.9 env: global: - GOPROXY=https://proxy.golang.org @@ -11,7 +11,7 @@ matrix: include: - language: go name: Code Lint - go: 1.13.8 + go: 1.13.9 env: - TESTSUITE=lintall before_install: @@ -20,7 +20,7 @@ matrix: - language: go name: Unit Test - go: 1.13.8 + go: 1.13.9 env: - TESTSUITE=unittest before_install: @@ -29,7 +29,7 @@ matrix: - language: go name: Build - go: 1.13.8 + go: 1.13.9 script: make after_success: - bash <(curl -s https://codecov.io/bash) diff --git a/Makefile b/Makefile index 18c1d7ea8e..9979ea432e 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.8 +GO_VERSION ?= 1.13.9 INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1) BUILDROOT_BRANCH ?= 2020.02.2 @@ -40,8 +40,9 @@ COMMIT_NO := $(shell git rev-parse HEAD 2> /dev/null || true) COMMIT ?= $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO}-dirty","${COMMIT_NO}") HYPERKIT_BUILD_IMAGE ?= karalabe/xgo-1.12.x -# NOTE: "latest" as of 2020-02-26. kube-cross images aren't updated as often as Kubernetes -BUILD_IMAGE ?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-1 +# 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 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 26ced54b91..943048421c 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.8" "/usr/local" || true +sudo ./installers/check_install_golang.sh "1.13.9" "/usr/local" || true docker rm -f -v $(docker ps -aq) >/dev/null 2>&1 || true docker volume prune -f || true From 3557344c04a5b9ddb0d210b471cffe9f340e777c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sun, 28 Jun 2020 20:41:02 +0200 Subject: [PATCH 2/2] Use correct version of go for github actions --- .github/workflows/master.yml | 12 ++++++++++++ .github/workflows/pr.yml | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index a31479093c..39f56ee96a 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -17,6 +17,10 @@ jobs: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 + - uses: actions/setup-go@v2 + with: + go-version: '1.13.9' + stable: true - name: Download Dependencies run: go mod download - name: Build Binaries @@ -40,6 +44,10 @@ jobs: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 + - uses: actions/setup-go@v2 + with: + go-version: '1.13.9' + stable: true - name: Install libvirt run: | sudo apt-get update @@ -55,6 +63,10 @@ jobs: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 + - uses: actions/setup-go@v2 + with: + go-version: '1.13.9' + stable: true - name: Install libvirt run: | sudo apt-get update diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 60428c014b..41bfbbc990 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -15,6 +15,10 @@ jobs: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 + - uses: actions/setup-go@v2 + with: + go-version: '1.13.9' + stable: true - name: Download Dependencies run: go mod download - name: Build Binaries @@ -38,6 +42,10 @@ jobs: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 + - uses: actions/setup-go@v2 + with: + go-version: '1.13.9' + stable: true - name: Install libvirt run: | sudo apt-get update @@ -53,6 +61,10 @@ jobs: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 + - uses: actions/setup-go@v2 + with: + go-version: '1.13.9' + stable: true - name: Install libvirt run: | sudo apt-get update