Skip to content

Commit

Permalink
Fix minor workflow issues
Browse files Browse the repository at this point in the history
  • Loading branch information
dabradley committed Aug 27, 2024
1 parent a3bbee2 commit d8d43ca
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ name: "CodeQL"

on:
push:
branches: [ master, 'release-**' ]
branches: [ "main", "development" ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master, 'release-**' ]
branches: [ "main", "development" ]
schedule:
- cron: '0 */24 * * *'

Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: Linux Tests

# Controls when the workflow will run
on:
pull_request: {}
push: {}
pull_request: {}
push: {}
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

Expand Down Expand Up @@ -38,9 +38,10 @@ jobs:
export PATH=$PATH:$HOME/.local/bin
make container
- name: Install goveralls
run: go install github.com/mattn/goveralls@latest

- name: Get code coverage
env:
COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
GO111MODULE=off go get github.com/mattn/goveralls
$(go env GOPATH)/bin/goveralls -coverprofile=profile.cov -service=github
run: goveralls -coverprofile=profile.cov -service=github
1 change: 1 addition & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1209,6 +1209,7 @@ golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
Expand Down
4 changes: 2 additions & 2 deletions hack/verify-golint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ set -euo pipefail

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

echo "Verifying golint"

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

echo "Congratulations! Lint check completed for all Go source files."
2 changes: 1 addition & 1 deletion pkg/csi-common/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func TestLogGRPC(t *testing.T) {
buf := new(bytes.Buffer)
klog.SetOutput(buf)

handler := func(ctx context.Context, req interface{}) (interface{}, error) { return nil, nil }
handler := func(_ context.Context, _ interface{}) (interface{}, error) { return nil, nil }
info := grpc.UnaryServerInfo{
FullMethod: "fake",
}
Expand Down

0 comments on commit d8d43ca

Please sign in to comment.