Skip to content

Commit 4209dc2

Browse files
committed
Go 1.19.6
"cherry-pick" the main PR 8109 Signed-off-by: Akihiro Suda <[email protected]>
1 parent 7c3b243 commit 4209dc2

7 files changed

Lines changed: 23 additions & 16 deletions

File tree

.github/workflows/ci.yml

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

2121
strategy:
2222
matrix:
23-
go-version: [1.18.10]
23+
go-version: [1.19.6]
2424
os: [ubuntu-18.04, macos-12, windows-2019]
2525

2626
steps:
@@ -47,7 +47,7 @@ jobs:
4747
steps:
4848
- uses: actions/setup-go@v2
4949
with:
50-
go-version: '1.18.10'
50+
go-version: '1.19.6'
5151

5252
- uses: actions/checkout@v2
5353
with:
@@ -73,7 +73,7 @@ jobs:
7373
steps:
7474
- uses: actions/setup-go@v2
7575
with:
76-
go-version: '1.18.10'
76+
go-version: '1.19.6'
7777

7878
- uses: actions/checkout@v2
7979
with:
@@ -105,7 +105,7 @@ jobs:
105105
steps:
106106
- uses: actions/setup-go@v2
107107
with:
108-
go-version: '1.18.10'
108+
go-version: '1.19.6'
109109
- uses: actions/checkout@v2
110110
- run: go install github.com/cpuguy83/go-md2man/[email protected]
111111
- run: make man
@@ -139,7 +139,7 @@ jobs:
139139
steps:
140140
- uses: actions/setup-go@v2
141141
with:
142-
go-version: '1.18.10'
142+
go-version: '1.19.6'
143143
- uses: actions/checkout@v2
144144
- run: |
145145
set -e -x
@@ -196,7 +196,7 @@ jobs:
196196
strategy:
197197
matrix:
198198
os: [ubuntu-18.04, macos-12, windows-2019]
199-
go-version: ['1.18.10']
199+
go-version: ['1.19.6']
200200

201201
steps:
202202
- uses: actions/setup-go@v2
@@ -238,7 +238,7 @@ jobs:
238238
steps:
239239
- uses: actions/setup-go@v2
240240
with:
241-
go-version: '1.18.10'
241+
go-version: '1.19.6'
242242

243243
- uses: actions/checkout@v2
244244
with:
@@ -327,7 +327,7 @@ jobs:
327327
steps:
328328
- uses: actions/setup-go@v2
329329
with:
330-
go-version: '1.18.10'
330+
go-version: '1.19.6'
331331

332332
- uses: actions/checkout@v2
333333

@@ -358,6 +358,10 @@ jobs:
358358
tar -zxf criu.tar.gz
359359
cd criu-3.13
360360
sudo make install-criu
361+
# To avoid "open /home/runner/.cache/go-build/06/064d2fc17cbd72370bed4243fab1bf42c225768d47524214a340efd73bf04838-d: permission denied"
362+
# in the following steps
363+
sudo rm -rf /home/runner/.cache/go-build
364+
sudo chown runner /home/runner/.cache
361365
362366
- name: Install failpoint binaries
363367
run: |
@@ -469,9 +473,9 @@ jobs:
469473
steps:
470474
- uses: actions/setup-go@v2
471475
with:
472-
go-version: '1.18.10'
476+
go-version: '1.19.6'
473477
- uses: actions/checkout@v2
474-
- run: sudo -E PATH=$PATH script/setup/install-gotestsum
478+
- run: script/setup/install-gotestsum
475479
- name: Tests
476480
env:
477481
GOTESTSUM_JUNITFILE: "${{ github.workspace }}/macos-test-junit.xml"

.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.18.10'
21+
go-version: '1.19.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.18.10'
138+
go-version: '1.19.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.18.10'
65+
go-version: '1.19.6'
6666

6767
- name: Set env
6868
shell: bash

.golangci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ linters:
1717
issues:
1818
include:
1919
- EXC0002
20+
exclude:
21+
# Silence "SA1019: "io/ioutil" has been deprecated since Go 1.16"
22+
- SA1019
2023

2124
run:
2225
timeout: 3m

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.18.10",
80+
'GO_VERSION': ENV['GO_VERSION'] || "1.19.6",
8181
}
8282
sh.inline = <<~SHELL
8383
#!/usr/bin/env bash

api/services/content/v1/content.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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.18.10
13+
ARG GOLANG_VERSION=1.19.6
1414

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

0 commit comments

Comments
 (0)