Skip to content

Commit 7e44a5e

Browse files
committed
contrib: upgrade golangci-lint to 1.49.0
Signed-off-by: Yan Song <[email protected]>
1 parent 4a9763a commit 7e44a5e

File tree

9 files changed

+11
-19
lines changed

9 files changed

+11
-19
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
${{ runner.os }}-go
3636
- name: test contrib UT
3737
run: |
38-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.43.0
38+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.49.0
3939
make contrib-test
4040
4141
smoke:
@@ -55,7 +55,7 @@ jobs:
5555
continue-on-error: true
5656
- name: Smoke Test
5757
run: |
58-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.43.0
58+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.49.0
5959
echo Cargo Home: $CARGO_HOME
6060
echo Running User: $(whoami)
6161
make docker-smoke

contrib/ctr-remote/.golangci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
linters:
44
enable:
5-
- structcheck
6-
- varcheck
75
- staticcheck
86
- unconvert
97
- gofmt

contrib/docker-nydus-graphdriver/.golangci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
linters:
44
enable:
5-
- structcheck
6-
- varcheck
75
- staticcheck
86
- unconvert
97
- gofmt

contrib/nydus-overlayfs/.golangci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
linters:
44
enable:
5-
- structcheck
6-
- varcheck
75
- staticcheck
86
- unconvert
97
- gofmt

contrib/nydus-overlayfs/cmd/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ var (
2222
)
2323

2424
/*
25-
containerd run fuse.mount format: nydus-overlayfs overlay /tmp/ctd-volume107067851
26-
-o lowerdir=/foo/lower2:/foo/lower1,upperdir=/foo/upper,workdir=/foo/work,extraoption={...},dev,suid]
25+
containerd run fuse.mount format: nydus-overlayfs overlay /tmp/ctd-volume107067851
26+
-o lowerdir=/foo/lower2:/foo/lower1,upperdir=/foo/upper,workdir=/foo/work,extraoption={...},dev,suid]
2727
*/
2828
type mountArgs struct {
2929
fsType string

contrib/nydusify/.golangci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
linters:
44
enable:
5-
- structcheck
6-
- varcheck
75
- staticcheck
86
- unconvert
97
- gofmt

contrib/nydusify/pkg/backend/backend.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import (
1515
)
1616

1717
// Backend transfers artifacts generated during image conversion to a backend storage such as:
18-
// 1. registry: complying to OCI distribution specification, push blob file
19-
// to registry and use the registry as a storage.
20-
// 2. oss: A object storage backend, which uses its SDK to transer blob file.
18+
// 1. registry: complying to OCI distribution specification, push blob file
19+
// to registry and use the registry as a storage.
20+
// 2. oss: A object storage backend, which uses its SDK to transer blob file.
2121
type Backend interface {
2222
// TODO: Hopefully, we can pass `Layer` struct in, thus to be able to cook both
2323
// file handle and file path.

contrib/nydusify/pkg/cache/cache.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ type Opt struct {
5858
// Here is the build cache workflow:
5959
// 1. Import cache records from registry;
6060
// 2. Check cache record using source layer ChainID before layer build,
61-
// skip layer build if the cache hit;
61+
// skip layer build if the cache hit;
6262
// 3. Export new cache records to registry;
6363
type Cache struct {
6464
opt Opt

contrib/nydusify/pkg/converter/provider/source.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
// Package provider abstracts interface to adapt to different build environments,
66
// the provider includes these components:
7-
// logger: output build progress for nydusify or buildkitd/buildctl;
8-
// remote: create a remote resolver, it communicates with remote registry;
9-
// source: responsible for getting image manifest, config, and mounting layer;
7+
// - logger: output build progress for nydusify or buildkitd/buildctl;
8+
// - remote: create a remote resolver, it communicates with remote registry;
9+
// - source: responsible for getting image manifest, config, and mounting layer;
1010
// Provider provides a default implementation, so we can use it in Nydusify
1111
// directly, but we need to implement it in buildkit or other any projects
1212
// which want to import nydusify package.

0 commit comments

Comments
 (0)