github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Update Go to 1.16.4

Browse Source 
fix [#45710](https://github.com/golang/go/issues/45710) and CVE-2021-31525.

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
This commit is contained in:
Jintao Zhang
2021-05-07 07:07:09 +08:00
parent ab963e1cc1
commit 79d800b9b0
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/ci.yml vendored
View File

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

4
.github/workflows/nightly.yml vendored
View File

@@ -18,7 +18,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.16.3' go-version: '1.16.4'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
@@ -135,7 +135,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.16.3' go-version: '1.16.4'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:

2
.github/workflows/release.yml vendored
View File

@@ -62,7 +62,7 @@ jobs:
- name: Install Go - name: Install Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: '1.16.3' go-version: '1.16.4'
- name: Set env - name: Set env
shell: bash shell: bash

2
.zuul/playbooks/containerd-build/run.yaml
View File

@@ -2,7 +2,7 @@
become: yes become: yes
roles: roles:
- role: config-golang - role: config-golang
go_version: '1.16.3' go_version: '1.16.4'
arch: arm64 arch: arm64
tasks: tasks:
- name: Build containerd - name: Build containerd

2
Vagrantfile vendored
View File

@@ -77,7 +77,7 @@ Vagrant.configure("2") do |config|
config.vm.provision "install-golang", type: "shell", run: "once" do |sh| config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
sh.upload_path = "/tmp/vagrant-install-golang" sh.upload_path = "/tmp/vagrant-install-golang"
sh.env = { sh.env = {
'GO_VERSION': ENV['GO_VERSION'] || "1.16.3", 'GO_VERSION': ENV['GO_VERSION'] || "1.16.4",
} }
sh.inline = <<~SHELL sh.inline = <<~SHELL
#!/usr/bin/env bash #!/usr/bin/env bash

2
contrib/Dockerfile.test
View File

@@ -10,7 +10,7 @@
# #
# docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc93 -f Dockerfile.test ../ # 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 FROM golang:${GOLANG_VERSION} AS golang-base
RUN mkdir -p /go/src/github.com/containerd/containerd RUN mkdir -p /go/src/github.com/containerd/containerd