Skip to content

Commit

Permalink
Merge pull request #111 from austinvazquez/add-go-1.20-support
Browse files Browse the repository at this point in the history
Add Go 1.20 support
  • Loading branch information
AkihiroSuda authored Feb 11, 2023
2 parents eeababb + 4930cbf commit 6603d5b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
16 changes: 10 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.17.x
go-version: 1.20.x

- name: Set env
shell: bash
Expand All @@ -29,11 +29,11 @@ jobs:
path: src/github.com/containerd/go-cni
fetch-depth: 25

- uses: containerd/project-checks@v1
- uses: containerd/project-checks@v1.1.0
with:
working-directory: src/github.com/containerd/go-cni

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

Expand All @@ -44,7 +44,7 @@ jobs:

strategy:
matrix:
go-version: [1.17.x]
go-version: [1.19.x, 1.20.x]
os: [ubuntu-22.04]

steps:
Expand All @@ -64,22 +64,26 @@ jobs:
- uses: golangci/golangci-lint-action@v3
with:
version: v1.50.1
version: v1.51.1
working-directory: src/github.com/containerd/go-cni

tests:
name: Tests
runs-on: ubuntu-22.04
timeout-minutes: 5

strategy:
matrix:
go-version: [1.19.x, 1.20.x]

steps:
- uses: actions/checkout@v3
with:
path: src/github.com/containerd/go-cni

- uses: actions/setup-go@v3
with:
go-version: 1.17.x
go-version: ${{ matrix.go }}

- name: Set env
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/containerd/go-cni

go 1.17
go 1.19

require (
github.com/containernetworking/cni v1.1.2
Expand Down

0 comments on commit 6603d5b

Please sign in to comment.