Skip to content

Commit 6603d5b

Browse files
authoredFeb 11, 2023
Merge pull request #111 from austinvazquez/add-go-1.20-support
Add Go 1.20 support
2 parents eeababb + 4930cbf commit 6603d5b

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed
 

‎.github/workflows/ci.yml

+10-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- uses: actions/setup-go@v3
1818
with:
19-
go-version: 1.17.x
19+
go-version: 1.20.x
2020

2121
- name: Set env
2222
shell: bash
@@ -29,11 +29,11 @@ jobs:
2929
path: src/github.com/containerd/go-cni
3030
fetch-depth: 25
3131

32-
- uses: containerd/project-checks@v1
32+
- uses: containerd/project-checks@v1.1.0
3333
with:
3434
working-directory: src/github.com/containerd/go-cni
3535

36-
- uses: containerd/project-checks@v1
36+
- uses: containerd/project-checks@v1.1.0
3737
with:
3838
working-directory: src/github.com/containerd/go-cni/integration
3939

@@ -44,7 +44,7 @@ jobs:
4444

4545
strategy:
4646
matrix:
47-
go-version: [1.17.x]
47+
go-version: [1.19.x, 1.20.x]
4848
os: [ubuntu-22.04]
4949

5050
steps:
@@ -64,22 +64,26 @@ jobs:
6464
6565
- uses: golangci/golangci-lint-action@v3
6666
with:
67-
version: v1.50.1
67+
version: v1.51.1
6868
working-directory: src/github.com/containerd/go-cni
6969

7070
tests:
7171
name: Tests
7272
runs-on: ubuntu-22.04
7373
timeout-minutes: 5
7474

75+
strategy:
76+
matrix:
77+
go-version: [1.19.x, 1.20.x]
78+
7579
steps:
7680
- uses: actions/checkout@v3
7781
with:
7882
path: src/github.com/containerd/go-cni
7983

8084
- uses: actions/setup-go@v3
8185
with:
82-
go-version: 1.17.x
86+
go-version: ${{ matrix.go }}
8387

8488
- name: Set env
8589
shell: bash

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/containerd/go-cni
22

3-
go 1.17
3+
go 1.19
44

55
require (
66
github.com/containernetworking/cni v1.1.2

0 commit comments

Comments
 (0)