Skip to content

Commit

Permalink
Merge pull request #5056 from estesp/go-1.16
Browse files Browse the repository at this point in the history
Update to Go 1.16.1
  • Loading branch information
AkihiroSuda committed Mar 11, 2021
2 parents 8634cd9 + c55492f commit 381cbdd
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

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

steps:
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.15.8'
go-version: '1.16.1'

- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.15.8'
go-version: '1.16.1'

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

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

- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -249,7 +249,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.15.8'
go-version: '1.16.1'

- 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.15.8'
go-version: '1.16.1'

- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.15.8'
go-version: '1.16.1'

- 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.15.8'
go-version: '1.16.1'

- 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.15.8'
go_version: '1.16.1'
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.15.8",
'GO_VERSION': ENV['GO_VERSION'] || "1.16.1",
}
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 @@ -6,7 +6,7 @@
# 3.) $ make binaries install test
#

ARG GOLANG_VERSION=1.15.8
ARG GOLANG_VERSION=1.16.1

FROM golang:${GOLANG_VERSION} AS golang-base
RUN mkdir -p /go/src/github.com/containerd/containerd
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/containerd/containerd

go 1.15
go 1.16

require (
github.com/BurntSushi/toml v0.3.1
Expand Down

0 comments on commit 381cbdd

Please sign in to comment.