Skip to content

Commit

Permalink
Update Go to 1.16.4
Browse files Browse the repository at this point in the history
fix [#45710](golang/go#45710) and CVE-2021-31525.

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
  • Loading branch information
tao12345666333 committed May 6, 2021
1 parent ab963e1 commit 79d800b
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
16 changes: 8 additions & 8 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.16.3]
go-version: [1.16.4]
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.16.3'
go-version: '1.16.4'

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

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

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

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

- 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.3'
go-version: '1.16.4'

- 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.3'
go-version: '1.16.4'

- 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.3'
go-version: '1.16.4'

- 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.3'
go_version: '1.16.4'
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.3",
'GO_VERSION': ENV['GO_VERSION'] || "1.16.4",
}
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-rc93 -f Dockerfile.test ../

ARG GOLANG_VERSION=1.16.3
ARG GOLANG_VERSION=1.16.4

FROM golang:${GOLANG_VERSION} AS golang-base
RUN mkdir -p /go/src/github.com/containerd/containerd
Expand Down

0 comments on commit 79d800b

Please sign in to comment.