Skip to content

Commit

Permalink
Merge pull request #137 from thaJeztah/refresh_ci
Browse files Browse the repository at this point in the history
ci/gha: add Go 1.22, update various actions, add macos-12, ubuntu-24.04
  • Loading branch information
thaJeztah authored Jul 3, 2024
2 parents 954b593 + 057bd48 commit 35f6c4e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion mountinfo/mounted_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion user/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 35f6c4e

Please sign in to comment.