Skip to content

Commit

Permalink
Merge pull request #6527 from thaJeztah/1.4_update_go
Browse files Browse the repository at this point in the history
[release/1.4] Update Go to 1.16.14
  • Loading branch information
estesp committed Feb 15, 2022
2 parents 0475ec3 + d6d073b commit b5811c7
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 20 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: '1.16.12'
go-version: '1.16.14'

- name: Set env
shell: bash
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.12'
go-version: '1.16.14'

- name: Set env
shell: bash
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.12'
go-version: '1.16.14'

- name: Set env
shell: bash
Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.12'
go-version: '1.16.14'

- name: Set env
shell: bash
Expand Down Expand Up @@ -199,7 +199,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.12'
go-version: '1.16.14'

- name: Set env
shell: bash
Expand Down Expand Up @@ -285,7 +285,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.12'
go-version: '1.16.14'

- name: Set env
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly.yml
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.12'
go-version: '1.16.14'

- name: Checkout
uses: actions/checkout@v1
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.12'
go-version: '1.16.14'

- name: Checkout
uses: actions/checkout@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Expand Up @@ -62,7 +62,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: '1.16.12'
go-version: '1.16.14'

- name: Set env
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -15,7 +15,7 @@ os:
- linux

go:
- "1.16.12"
- "1.16.14"

env:
- TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v1 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=bionic GOPROXY=direct
Expand Down
2 changes: 1 addition & 1 deletion .zuul/playbooks/containerd-build/run.yaml
Expand Up @@ -2,7 +2,7 @@
become: yes
roles:
- role: config-golang
go_version: '1.16.12'
go_version: '1.16.14'
arch: arm64
tasks:
- name: Build containerd
Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile
Expand Up @@ -77,7 +77,7 @@ Vagrant.configure("2") do |config|
config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
sh.upload_path = "/tmp/vagrant-install-golang"
sh.env = {
'GO_VERSION': ENV['GO_VERSION'] || "1.16.12",
'GO_VERSION': ENV['GO_VERSION'] || "1.16.14",
}
sh.inline = <<~SHELL
#!/usr/bin/env bash
Expand Down
2 changes: 1 addition & 1 deletion contrib/Dockerfile.test
Expand Up @@ -10,7 +10,7 @@
#
# docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc93 -f Dockerfile.test ../

ARG GOLANG_VERSION=1.16.12
ARG GOLANG_VERSION=1.16.14

FROM golang:${GOLANG_VERSION} AS golang-base
RUN mkdir -p /go/src/github.com/containerd/containerd
Expand Down
3 changes: 2 additions & 1 deletion script/setup/install-critools
Expand Up @@ -20,7 +20,8 @@
#
set -eu -o pipefail

go get -u github.com/onsi/ginkgo/ginkgo
GO111MODULE=on go install github.com/onsi/ginkgo/ginkgo@v1.16.5

CRITEST_COMMIT=53ad8bb7f97e1b1d1c0c0634e43a3c2b8b07b718
git clone https://github.com/kubernetes-sigs/cri-tools.git "$GOPATH"/src/github.com/kubernetes-sigs/cri-tools
cd "$GOPATH"/src/github.com/kubernetes-sigs/cri-tools
Expand Down
10 changes: 4 additions & 6 deletions script/setup/install-dev-tools
Expand Up @@ -20,15 +20,13 @@
#
set -eu -o pipefail

# install the `protobuild` binary in $GOPATH/bin; requires module-aware install
# to pin dependencies
GO111MODULE=on go get github.com/stevvooe/protobuild
# install `protobuild` and other commands
GO111MODULE=on go install github.com/stevvooe/protobuild@v0.1.0
GO111MODULE=on go install github.com/cpuguy83/go-md2man/v2@v2.0.0
GO111MODULE=on go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.23.8

# the following packages need to exist in $GOPATH so we can't use
# go modules-aware mode of `go get` for these includes used during
# proto building
GO111MODULE=off go get -d github.com/gogo/googleapis || true
GO111MODULE=off go get -d github.com/gogo/protobuf || true

GO111MODULE=on go get github.com/cpuguy83/go-md2man/v2@v2.0.0
GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.23.8

0 comments on commit b5811c7

Please sign in to comment.