Skip to content

Commit 35f6c4e

Browse files
authored
Merge pull request #137 from thaJeztah/refresh_ci
ci/gha: add Go 1.22, update various actions, add macos-12, ubuntu-24.04
2 parents 954b593 + 057bd48 commit 35f6c4e

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ jobs:
44
test:
55
strategy:
66
matrix:
7-
go-version: [1.17.x, 1.20.x, 1.21.x]
8-
platform: [ubuntu-20.04, ubuntu-22.04, windows-latest, macos-11]
7+
go-version: [1.17.x, 1.21.x, 1.22.x]
8+
platform: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, windows-latest, macos-12, macos-14]
99
runs-on: ${{ matrix.platform }}
1010
steps:
1111
- name: Install Go
12-
uses: actions/setup-go@v4
12+
uses: actions/setup-go@v5
1313
with:
1414
go-version: ${{ matrix.go-version }}
1515
- name: Checkout code
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717
- name: go mod tidy
1818
run: |
1919
make tidy

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ lint: $(BINDIR)/golangci-lint
4848
done
4949

5050
$(BINDIR)/golangci-lint: $(BINDIR)
51-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(BINDIR) v1.55.1
51+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(BINDIR) v1.59.1
5252

5353
$(BINDIR):
5454
mkdir -p $(BINDIR)

mountinfo/mounted_linux.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func mountedByOpenat2(path string) (bool, error) {
5151
Resolve: unix.RESOLVE_NO_XDEV,
5252
})
5353
_ = unix.Close(dirfd)
54-
switch err { //nolint:errorlint // unix errors are bare
54+
switch err {
5555
case nil: // definitely not a mount
5656
_ = unix.Close(fd)
5757
return false, nil

user/user.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ func ParseGroupFilter(r io.Reader, filter func(Group) bool) ([]Group, error) {
197197
for {
198198
var line []byte
199199
line, isPrefix, err = rd.ReadLine()
200-
201200
if err != nil {
202201
// We should return no error if EOF is reached
203202
// without a match.

0 commit comments

Comments
 (0)