Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump CI go version and linter #218

Merged
merged 1 commit into from
Aug 26, 2024
Merged

Bump CI go version and linter #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,18 @@ name: test
on: ["push", "pull_request"]

env:
GO_VERSION: "1.22"
GO_VERSION: "1.23"
LINUX_ARCHES: "amd64 386 arm arm64 s390x mips64le ppc64le"

jobs:
build:
name: Build all linux architectures
runs-on: ubuntu-latest
steps:
- name: setup go
uses: actions/setup-go@v5
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: ${{ env.GO_VERSION }}
- uses: actions/checkout@v4

- name: Build on all supported architectures
run: |
Expand All @@ -30,11 +29,10 @@ jobs:
name: Run tests on Linux amd64
runs-on: ubuntu-latest
steps:
- name: setup go
uses: actions/setup-go@v5
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: ${{ env.GO_VERSION }}
- uses: actions/checkout@v4

- name: Install test binaries
run: |
Expand All @@ -58,4 +56,6 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: ${{ env.GO_VERSION }}
- run: make lint
1 change: 0 additions & 1 deletion .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ linters:
- errname
- errorlint
- exhaustive
- exportloopref
- fatcontext
- forbidigo
- forcetypeassert
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ BUILD_INFO := $(shell date +%s)

BUILD_PATH := $(shell pwd)/build
GOLANGCI_LINT := ${BUILD_PATH}/golangci-lint
GOLANGCI_LINT_VERSION := v1.59.1
GOLANGCI_LINT_VERSION := v1.60.3

# If GOPATH not specified, use one in the local directory
ifeq ($(GOPATH),)
Expand Down
4 changes: 2 additions & 2 deletions pkg/ocicni/ocicni.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ func (plugin *cniNetworkPlugin) SetUpPodWithContext(ctx context.Context, podNetw

// Set up loopback interface
if err := bringUpLoopback(podNetwork.NetNS); err != nil {
logrus.Errorf(err.Error())
logrus.Error(err)
return nil, err
}

Expand Down Expand Up @@ -732,7 +732,7 @@ func (plugin *cniNetworkPlugin) GetPodNetworkStatusWithContext(ctx context.Conte
defer plugin.podUnlock(&podNetwork)

if err := checkLoopback(podNetwork.NetNS); err != nil {
logrus.Errorf(err.Error())
logrus.Error(err)
return nil, err
}

Expand Down
Loading