Skip to content

Commit 4b72407

Browse files
dmcgowandmcgowan
authored
Merge pull request #5723 from AkihiroSuda/go1.16.6-15
[release/1.5] Update Go to 1.16.6
2 parents 911cd57 + 43d0892 commit 4b72407

10 files changed

Lines changed: 21 additions & 20 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
strategy:
2222
matrix:
23-
go-version: [1.16.4]
23+
go-version: [1.16.6]
2424
os: [ubuntu-18.04, macos-10.15, windows-2019]
2525

2626
steps:
@@ -51,7 +51,7 @@ jobs:
5151
steps:
5252
- uses: actions/setup-go@v2
5353
with:
54-
go-version: '1.16.4'
54+
go-version: '1.16.6'
5555

5656
- shell: bash
5757
run: |
@@ -82,7 +82,7 @@ jobs:
8282
steps:
8383
- uses: actions/setup-go@v2
8484
with:
85-
go-version: '1.16.4'
85+
go-version: '1.16.6'
8686

8787
- uses: actions/checkout@v2
8888
with:
@@ -115,7 +115,7 @@ jobs:
115115
steps:
116116
- uses: actions/setup-go@v2
117117
with:
118-
go-version: '1.16.4'
118+
go-version: '1.16.6'
119119

120120
- name: Set env
121121
shell: bash
@@ -161,7 +161,7 @@ jobs:
161161
steps:
162162
- uses: actions/setup-go@v2
163163
with:
164-
go-version: '1.16.4'
164+
go-version: '1.16.6'
165165
- name: Set env
166166
shell: bash
167167
run: |
@@ -226,7 +226,7 @@ jobs:
226226
strategy:
227227
matrix:
228228
os: [ubuntu-18.04, macos-10.15, windows-2019]
229-
go-version: ['1.16.4']
229+
go-version: ['1.16.6']
230230
include:
231231
# Go 1.13.x is still used by Docker/Moby
232232
- go-version: '1.13.x'
@@ -272,7 +272,7 @@ jobs:
272272
steps:
273273
- uses: actions/setup-go@v2
274274
with:
275-
go-version: '1.16.4'
275+
go-version: '1.16.6'
276276

277277
- uses: actions/checkout@v2
278278
with:
@@ -353,7 +353,7 @@ jobs:
353353
steps:
354354
- uses: actions/setup-go@v2
355355
with:
356-
go-version: '1.16.4'
356+
go-version: '1.16.6'
357357

358358
- uses: actions/checkout@v2
359359
with:
@@ -504,7 +504,7 @@ jobs:
504504
steps:
505505
- uses: actions/setup-go@v2
506506
with:
507-
go-version: '1.16.4'
507+
go-version: '1.16.6'
508508

509509
- uses: actions/checkout@v2
510510
with:

‎.github/workflows/nightly.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- uses: actions/setup-go@v2
2020
with:
21-
go-version: '1.16.4'
21+
go-version: '1.16.6'
2222

2323
- uses: actions/checkout@v2
2424
with:
@@ -135,7 +135,7 @@ jobs:
135135
steps:
136136
- uses: actions/setup-go@v2
137137
with:
138-
go-version: '1.16.4'
138+
go-version: '1.16.6'
139139

140140
- uses: actions/checkout@v2
141141
with:

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
- name: Install Go
6363
uses: actions/setup-go@v2
6464
with:
65-
go-version: '1.16.4'
65+
go-version: '1.16.6'
6666

6767
- name: Set env
6868
shell: bash

‎.zuul/playbooks/containerd-build/integration-test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
become: yes
33
roles:
44
- role: config-golang
5-
go_version: '1.16.3'
5+
go_version: '1.16.6'
66
arch: arm64
77
tasks:
88
- name: Install pre-requisites

‎.zuul/playbooks/containerd-build/run.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
become: yes
33
roles:
44
- role: config-golang
5-
go_version: '1.16.4'
5+
go_version: '1.16.6'
66
arch: arm64
77
tasks:
88
- name: Build containerd

‎.zuul/playbooks/containerd-build/unit-test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
become: yes
33
roles:
44
- role: config-golang
5-
go_version: '1.16.3'
5+
go_version: '1.16.6'
66
arch: arm64
77
tasks:
88
- name: Build and test containerd

‎Vagrantfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Vagrant.configure("2") do |config|
7777
config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
7878
sh.upload_path = "/tmp/vagrant-install-golang"
7979
sh.env = {
80-
'GO_VERSION': ENV['GO_VERSION'] || "1.16.4",
80+
'GO_VERSION': ENV['GO_VERSION'] || "1.16.6",
8181
}
8282
sh.inline = <<~SHELL
8383
#!/usr/bin/env bash

‎contrib/Dockerfile.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
# docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc93 -f Dockerfile.test ../
1212

13-
ARG GOLANG_VERSION=1.16.4
13+
ARG GOLANG_VERSION=1.16.6
1414

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

‎integration/client/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ module github.com/containerd/containerd/integration/client
33
go 1.15
44

55
require (
6-
github.com/Microsoft/hcsshim v0.8.16
6+
github.com/Microsoft/hcsshim v0.8.18
77
github.com/Microsoft/hcsshim/test v0.0.0-20210408205431-da33ecd607e1
88
github.com/containerd/cgroups v1.0.1
99
// the actual version of containerd is replaced with the code at the root of this repository
10-
github.com/containerd/containerd v1.5.0-rc.0
10+
github.com/containerd/containerd v1.5.1
1111
github.com/containerd/go-runc v1.0.0
1212
github.com/containerd/ttrpc v1.0.2
1313
github.com/containerd/typeurl v1.0.2

‎integration/client/go.sum‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ github.com/Microsoft/go-winio v0.4.17 h1:iT12IBVClFevaf8PuVyi3UmZOVh4OqnaLxDTW2O
4040
github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
4141
github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
4242
github.com/Microsoft/hcsshim v0.8.15/go.mod h1:x38A4YbHbdxJtc0sF6oIz+RG0npwSCAvn69iY6URG00=
43-
github.com/Microsoft/hcsshim v0.8.16 h1:8/auA4LFIZFTGrqfKhGBSXwM6/4X1fHa/xniyEHu8ac=
4443
github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+VxGOoXdC600=
44+
github.com/Microsoft/hcsshim v0.8.18 h1:cYnKADiM1869gvBpos3YCteeT6sZLB48lB5dmMMs8Tg=
45+
github.com/Microsoft/hcsshim v0.8.18/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4=
4546
github.com/Microsoft/hcsshim/test v0.0.0-20210408205431-da33ecd607e1 h1:pVKfKyPkXna29XlGjxSr9J0A7vNucOUHZ/2ClcTWalw=
4647
github.com/Microsoft/hcsshim/test v0.0.0-20210408205431-da33ecd607e1/go.mod h1:Cmvnhlie15Ha2UYrJs9EhgSx76Bq9RV2FgfEiT78GhI=
4748
github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=

0 commit comments

Comments
 (0)