Skip to content

Commit

Permalink
Update Go to 1.16.6
Browse files Browse the repository at this point in the history
Release notes: https://golang.org/doc/devel/release#go1.16

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
  • Loading branch information
AkihiroSuda committed Jul 13, 2021
1 parent cbdebd1 commit e72046f
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

strategy:
matrix:
go-version: [1.16.4]
go-version: [1.16.6]
os: [ubuntu-18.04, macos-10.15, windows-2019]

steps:
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.4'
go-version: '1.16.6'

- shell: bash
run: |
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.4'
go-version: '1.16.6'

- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.4'
go-version: '1.16.6'

- name: Set env
shell: bash
Expand Down Expand Up @@ -163,7 +163,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.4'
go-version: '1.16.6'
- name: Set env
shell: bash
run: |
Expand Down Expand Up @@ -228,7 +228,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-18.04, macos-10.15, windows-2019]
go-version: ['1.16.4']
go-version: ['1.16.6']
include:
# Go 1.13.x is still used by Docker/Moby
- go-version: '1.13.x'
Expand Down Expand Up @@ -274,7 +274,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.4'
go-version: '1.16.6'

- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -355,7 +355,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.4'
go-version: '1.16.6'

- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -498,7 +498,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.4'
go-version: '1.16.6'

- uses: actions/checkout@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.4'
go-version: '1.16.6'

- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.4'
go-version: '1.16.6'

- uses: actions/checkout@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: '1.16.4'
go-version: '1.16.6'

- name: Set env
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .zuul/playbooks/containerd-build/run.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
become: yes
roles:
- role: config-golang
go_version: '1.16.4'
go_version: '1.16.6'
arch: arm64
tasks:
- name: Build containerd
Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
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.4",
'GO_VERSION': ENV['GO_VERSION'] || "1.16.6",
}
sh.inline = <<~SHELL
#!/usr/bin/env bash
Expand Down
2 changes: 1 addition & 1 deletion contrib/Dockerfile.test
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc94 -f Dockerfile.test ../

ARG GOLANG_VERSION=1.16.4
ARG GOLANG_VERSION=1.16.6

FROM golang:${GOLANG_VERSION} AS golang-base
RUN mkdir -p /go/src/github.com/containerd/containerd
Expand Down
2 changes: 1 addition & 1 deletion script/setup/prepare_env_windows.ps1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Prepare windows environment for building and running containerd tests

$PACKAGES= @{ mingw = ""; git = ""; golang = "1.16.4"; make = "" }
$PACKAGES= @{ mingw = ""; git = ""; golang = "1.16.6"; make = "" }

write-host "Downloading chocolatey package"
curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'
Expand Down

0 comments on commit e72046f

Please sign in to comment.