Skip to content

Commit dd74103

Browse files
authored
Merge pull request #74 from thaJeztah/fix_gha
gha: fix golangci-lint, and upgrade to v1.52.2
2 parents df61585 + 23c831a commit dd74103

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ jobs:
2121
- name: Set env
2222
shell: bash
2323
run: |
24-
echo "GOPATH=${{ github.workspace }}" >> $GITHUB_ENV
2524
echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
2625
2726
- uses: actions/checkout@v3
@@ -51,13 +50,18 @@ jobs:
5150
- name: Set env
5251
shell: bash
5352
run: |
54-
echo "GOPATH=${{ github.workspace }}" >> $GITHUB_ENV
5553
echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
5654
55+
- uses: actions/setup-go@v3
56+
with:
57+
go-version: ${{ matrix.os-version }}
58+
59+
- uses: actions/checkout@v3
5760
- uses: golangci/golangci-lint-action@v3
5861
with:
59-
version: v1.50.1
60-
working-directory: src/github.com/containerd/zfs
62+
version: v1.52.2
63+
skip-cache: true
64+
args: --timeout=8m
6165

6266
tests:
6367
name: Tests
@@ -76,7 +80,6 @@ jobs:
7680
- name: Set env
7781
shell: bash
7882
run: |
79-
echo "GOPATH=${{ github.workspace }}" >> $GITHUB_ENV
8083
echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
8184
8285
- run: |

plugin/plugin.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//go:build linux || freebsd
2+
13
/*
24
Copyright The containerd Authors.
35

zfs.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//go:build linux || freebsd
2-
// +build linux freebsd
32

43
/*
54
Copyright The containerd Authors.

zfs_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//go:build linux
2-
// +build linux
32

43
/*
54
Copyright The containerd Authors.

0 commit comments

Comments
 (0)