Skip to content

Commit 7c93e26

Browse files
committed
Fix minor workflow issues
1 parent a3bbee2 commit 7c93e26

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [ master, 'release-**' ]
16+
branches: [ "main", "development" ]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [ master, 'release-**' ]
19+
branches: [ "main", "development" ]
2020
schedule:
2121
- cron: '0 */24 * * *'
2222

.github/workflows/linux.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: Linux Tests
22

33
# Controls when the workflow will run
44
on:
5-
pull_request: {}
6-
push: {}
5+
pull_request: {}
6+
push: {}
77
# Allows you to run this workflow manually from the Actions tab
88
workflow_dispatch:
99

@@ -38,9 +38,10 @@ jobs:
3838
export PATH=$PATH:$HOME/.local/bin
3939
make container
4040
41+
- name: Install goveralls
42+
run: go install github.com/mattn/goveralls@latest
43+
4144
- name: Get code coverage
4245
env:
4346
COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44-
run: |
45-
GO111MODULE=off go get github.com/mattn/goveralls
46-
$(go env GOPATH)/bin/goveralls -coverprofile=profile.cov -service=github
47+
run: goveralls -coverprofile=profile.cov -service=github

go.sum

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1209,6 +1209,7 @@ golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
12091209
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
12101210
golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
12111211
golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
1212+
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
12121213
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
12131214
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
12141215
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

hack/verify-golint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ set -euo pipefail
1818

1919
if [[ -z "$(command -v golangci-lint)" ]]; then
2020
echo "Cannot find golangci-lint. Installing golangci-lint..."
21-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.0
21+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.60.3
2222
export PATH=$PATH:$(go env GOPATH)/bin
2323
fi
2424

2525
echo "Verifying golint"
2626

2727
# The deprecated 'golint' linter has been replaced with 'revive'
28-
golangci-lint run --no-config --enable=revive --deadline=10m
28+
golangci-lint run --no-config --enable=revive --timeout=10m
2929

3030
echo "Congratulations! Lint check completed for all Go source files."

pkg/csi-common/utils_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func TestLogGRPC(t *testing.T) {
9898
buf := new(bytes.Buffer)
9999
klog.SetOutput(buf)
100100

101-
handler := func(ctx context.Context, req interface{}) (interface{}, error) { return nil, nil }
101+
handler := func(_ context.Context, _ interface{}) (interface{}, error) { return nil, nil }
102102
info := grpc.UnaryServerInfo{
103103
FullMethod: "fake",
104104
}

0 commit comments

Comments
 (0)