diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index afc29bb7..c92b3a58 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,16 +4,16 @@ jobs: test: strategy: matrix: - go-version: [1.17.x, 1.20.x, 1.21.x] - platform: [ubuntu-20.04, ubuntu-22.04, windows-latest, macos-11] + go-version: [1.17.x, 1.21.x, 1.22.x] + platform: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, windows-latest, macos-12, macos-14] runs-on: ${{ matrix.platform }} steps: - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ${{ matrix.go-version }} - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: go mod tidy run: | make tidy diff --git a/Makefile b/Makefile index 9005bbc2..14e79bd9 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ lint: $(BINDIR)/golangci-lint done $(BINDIR)/golangci-lint: $(BINDIR) - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(BINDIR) v1.55.1 + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(BINDIR) v1.59.1 $(BINDIR): mkdir -p $(BINDIR) diff --git a/mountinfo/mounted_linux.go b/mountinfo/mounted_linux.go index e78e7261..58f13c26 100644 --- a/mountinfo/mounted_linux.go +++ b/mountinfo/mounted_linux.go @@ -51,7 +51,7 @@ func mountedByOpenat2(path string) (bool, error) { Resolve: unix.RESOLVE_NO_XDEV, }) _ = unix.Close(dirfd) - switch err { //nolint:errorlint // unix errors are bare + switch err { case nil: // definitely not a mount _ = unix.Close(fd) return false, nil diff --git a/user/user.go b/user/user.go index 984466d1..198c4936 100644 --- a/user/user.go +++ b/user/user.go @@ -197,7 +197,6 @@ func ParseGroupFilter(r io.Reader, filter func(Group) bool) ([]Group, error) { for { var line []byte line, isPrefix, err = rd.ReadLine() - if err != nil { // We should return no error if EOF is reached // without a match.