Skip to content

Commit a19ad9b

Browse files
author
Kazuyoshi Kato
committed
Use Go 1.18 to build and test containerd
Go 1.18 is released. Go 1.16 is no longer supported by the Go team. golangci-lint is updated since 1.44.2 doesn't support Go 1.18. Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
1 parent 0c70165 commit a19ad9b

File tree

10 files changed

+20
-21
lines changed

10 files changed

+20
-21
lines changed

‎.github/workflows/build-test-images.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
steps:
4040
- uses: actions/setup-go@v2
4141
with:
42-
go-version: '1.17.8'
42+
go-version: '1.18.0'
4343

4444
- uses: actions/checkout@v2
4545
with:

‎.github/workflows/ci.yml‎

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

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

2626
steps:
@@ -31,7 +31,7 @@ jobs:
3131
- uses: actions/checkout@v2
3232
- uses: golangci/golangci-lint-action@v3
3333
with:
34-
version: v1.44.2
34+
version: v1.45.0
3535
skip-cache: true
3636
args: --timeout=5m
3737

@@ -46,7 +46,7 @@ jobs:
4646
steps:
4747
- uses: actions/setup-go@v2
4848
with:
49-
go-version: '1.17.8'
49+
go-version: '1.18.0'
5050

5151
- uses: actions/checkout@v2
5252
with:
@@ -78,7 +78,7 @@ jobs:
7878
steps:
7979
- uses: actions/setup-go@v2
8080
with:
81-
go-version: '1.17.8'
81+
go-version: '1.18.0'
8282

8383
- uses: actions/checkout@v2
8484
with:
@@ -110,7 +110,7 @@ jobs:
110110
steps:
111111
- uses: actions/setup-go@v2
112112
with:
113-
go-version: '1.17.8'
113+
go-version: '1.18.0'
114114
- uses: actions/checkout@v2
115115
- run: go install github.com/cpuguy83/go-md2man/v2@v2.0.1
116116
- run: make man
@@ -144,7 +144,7 @@ jobs:
144144
steps:
145145
- uses: actions/setup-go@v2
146146
with:
147-
go-version: '1.17.8'
147+
go-version: '1.18.0'
148148
- uses: actions/checkout@v2
149149
- run: |
150150
set -e -x
@@ -201,8 +201,7 @@ jobs:
201201
strategy:
202202
matrix:
203203
os: [ubuntu-18.04, macos-10.15, windows-2019, windows-2022]
204-
go-version: ['1.16.15', '1.17.8']
205-
204+
go-version: ['1.17.8', '1.18.0']
206205
steps:
207206
- uses: actions/setup-go@v2
208207
with:
@@ -248,7 +247,7 @@ jobs:
248247
steps:
249248
- uses: actions/setup-go@v2
250249
with:
251-
go-version: '1.17.8'
250+
go-version: '1.18.0'
252251

253252
- uses: actions/checkout@v2
254253
with:
@@ -370,7 +369,7 @@ jobs:
370369
steps:
371370
- uses: actions/setup-go@v2
372371
with:
373-
go-version: '1.17.8'
372+
go-version: '1.18.0'
374373

375374
- uses: actions/checkout@v2
376375

@@ -489,7 +488,7 @@ jobs:
489488
steps:
490489
- uses: actions/setup-go@v2
491490
with:
492-
go-version: '1.17.8'
491+
go-version: '1.18.0'
493492
- uses: actions/checkout@v2
494493
- run: sudo -E PATH=$PATH script/setup/install-gotestsum
495494
- name: Tests

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
- uses: actions/setup-go@v2
2828
with:
29-
go-version: 1.17.8
29+
go-version: 1.18.0
3030

3131
# Initializes the CodeQL tools for scanning.
3232
- name: Initialize CodeQL

‎.github/workflows/images.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
steps:
2525
- uses: actions/setup-go@v2
2626
with:
27-
go-version: '1.17.8'
27+
go-version: '1.18.0'
2828

2929
- uses: actions/checkout@v2
3030
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.17.8'
21+
go-version: '1.18.0'
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.17.8'
138+
go-version: '1.18.0'
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
@@ -64,7 +64,7 @@ jobs:
6464
- name: Install Go
6565
uses: actions/setup-go@v2
6666
with:
67-
go-version: '1.17.8'
67+
go-version: '1.18.0'
6868
- name: Set env
6969
shell: bash
7070
env:

‎.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.17.8'
5+
go_version: '1.18'
66
arch: arm64
77
tasks:
88
- name: Build 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.17.8",
80+
'GO_VERSION': ENV['GO_VERSION'] || "1.18",
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-rc94 -f Dockerfile.test ../
1212

13-
ARG GOLANG_VERSION=1.17.8
13+
ARG GOLANG_VERSION=1.18
1414
ARG GOLANG_IMAGE=golang
1515

1616
FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang

‎script/setup/prepare_env_windows.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Prepare windows environment for building and running containerd tests
22

3-
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.17.8"; make = ""; nssm = "" }
3+
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.18"; make = ""; nssm = "" }
44

55
Write-Host "Downloading chocolatey package"
66
curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'

0 commit comments

Comments
 (0)