Skip to content

Commit

Permalink
Merge pull request #8781 from medyagh/update_go_ver
Browse files Browse the repository at this point in the history
update golang version
  • Loading branch information
medyagh authored Jul 20, 2020
2 parents 79088e6 + 77c9498 commit 2183c90
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.13.9'
go-version: '1.14.6'
stable: true
- name: Download Dependencies
run: go mod download
Expand All @@ -46,7 +46,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.13.9'
go-version: '1.14.6'
stable: true
- name: Install libvirt
run: |
Expand All @@ -65,7 +65,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.13.9'
go-version: '1.14.6'
stable: true
- name: Install libvirt
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.13.9'
go-version: '1.14.6'
stable: true
- name: Download Dependencies
run: go mod download
Expand All @@ -44,7 +44,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.13.9'
go-version: '1.14.6'
stable: true
- name: Install libvirt
run: |
Expand All @@ -63,7 +63,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.13.9'
go-version: '1.14.6'
stable: true
- name: Install libvirt
run: |
Expand Down
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
os: linux
language: go
go:
- 1.14.4
- 1.14.6
env:
global:
- GOPROXY=https://proxy.golang.org
matrix:
include:
- language: go
name: Code Lint
go: 1.14.4
go: 1.14.6
env:
- TESTSUITE=lintall
before_install:
Expand All @@ -20,7 +20,7 @@ matrix:

- language: go
name: Unit Test
go: 1.14.4
go: 1.14.6
env:
- TESTSUITE=unittest
before_install:
Expand All @@ -29,7 +29,7 @@ matrix:

- language: go
name: Build
go: 1.14.4
go: 1.14.6
script: make
after_success:
- bash <(curl -s https://codecov.io/bash)
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.14.4
GO_VERSION ?= 1.14.6

INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1)
BUILDROOT_BRANCH ?= 2019.02.11
Expand All @@ -42,7 +42,7 @@ 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/master/build/build-image/cross/VERSION
BUILD_IMAGE ?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-2
BUILD_IMAGE ?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-1
ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image
KVM_BUILD_IMAGE ?= $(REGISTRY)/kvm-build-image:$(GO_VERSION)

Expand Down
2 changes: 1 addition & 1 deletion hack/jenkins/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.14.4" "/usr/local" || true
sudo ./installers/check_install_golang.sh "1.14.6" "/usr/local" || true

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

0 comments on commit 2183c90

Please sign in to comment.