mirror
/
restic
mirror of https://github.com/restic/restic.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4596 from MichaelEischer/update-golangcilint 

CI: update golangci-lint
This commit is contained in:
Michael Eischer 2023-12-23 13:48:33 +01:00 committed by GitHub
parent b72de5a883 dbbd31bc3a
commit da4e3edbbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/tests.yml vendored
View File

@ -255,7 +255,7 @@ jobs:
uses: golangci/golangci-lint-action@v3 uses: golangci/golangci-lint-action@v3
with: with:
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version. # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
version: v1.52.2 version: v1.55.2
args: --verbose --timeout 5m args: --verbose --timeout 5m
# only run golangci-lint for pull requests, otherwise ALL hints get # only run golangci-lint for pull requests, otherwise ALL hints get

3
cmd/restic/integration_helpers_test.go
View File

@ -124,9 +124,8 @@ func directoriesContentsDiff(dir1, dir2 string) string {
fmt.Fprintf(&out, "+%v\n", b.path) fmt.Fprintf(&out, "+%v\n", b.path)
b = nil b = nil
continue continue
} else {
fmt.Fprintf(&out, "%%%v\n", a.path)
} }
fmt.Fprintf(&out, "%%%v\n", a.path)
} }
a, b = nil, nil a, b = nil, nil

3
internal/fuse/snapshots_dir.go
View File

@ -110,9 +110,8 @@ func (d *SnapshotsDir) Lookup(ctx context.Context, name string) (fs.Node, error)
return newSnapshotLink(d.root, inode, entry.linkTarget, entry.snapshot) return newSnapshotLink(d.root, inode, entry.linkTarget, entry.snapshot)
} else if entry.snapshot != nil { } else if entry.snapshot != nil {
return newDirFromSnapshot(d.root, inode, entry.snapshot) return newDirFromSnapshot(d.root, inode, entry.snapshot)
} else {
return NewSnapshotsDir(d.root, inode, d.inode, d.dirStruct, d.prefix+"/"+name), nil
} }
return NewSnapshotsDir(d.root, inode, d.inode, d.dirStruct, d.prefix+"/"+name), nil
} }
return nil, syscall.ENOENT return nil, syscall.ENOENT