Skip to content

Commit

Permalink
Merge pull request #122 from architkulkarni/test-linter-empty-commit
Browse files Browse the repository at this point in the history
Bump github actions dependencies to match containerd CI repo and fix lint
  • Loading branch information
mikebrow authored Nov 25, 2024
2 parents 1c1be5e + 386f475 commit 9fbd439
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
timeout-minutes: 5

steps:
- uses: actions/setup-go@v3
- uses: actions/setup-go@v5
with:
go-version: 1.21.x

Expand All @@ -24,7 +24,7 @@ jobs:
echo "GOPATH=${{ github.workspace }}" >> $GITHUB_ENV
echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: src/github.com/containerd/go-cni
fetch-depth: 25
Expand All @@ -48,11 +48,11 @@ jobs:
os: [ubuntu-22.04]

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

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

Expand All @@ -62,9 +62,9 @@ jobs:
echo "GOPATH=${{ github.workspace }}" >> $GITHUB_ENV
echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
- uses: golangci/golangci-lint-action@v3
- uses: golangci/golangci-lint-action@v6
with:
version: v1.56.1
version: v1.61.0
working-directory: src/github.com/containerd/go-cni

tests:
Expand All @@ -77,11 +77,11 @@ jobs:
go-version: ["1.21.8", "1.22.1"]

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

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

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ A generic CNI library to provide APIs for CNI plugin interactions. The library p
- Query status of CNI network plugin initialization
- Check verifies the network is still in desired state

go-cni aims to support plugins that implement [Container Network Interface](https://github.com/containernetworking/cni)
go-cni aims to support plugins that implement the [Container Network Interface](https://github.com/containernetworking/cni).

## Usage
```go
Expand Down

0 comments on commit 9fbd439

Please sign in to comment.