Skip to content

Commit

Permalink
Reenable sloglint now that golangci-lint includes sloglint 0.7.1 (#1733)
Browse files Browse the repository at this point in the history
  • Loading branch information
RebeccaMahany authored Jul 8, 2024
1 parent 6208861 commit 3204ad5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ jobs:
- run: make deps

- name: golangci-lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v6
with:
skip-pkg-cache: true
skip-save-cache: true

# Run again as a workaround for https://github.com/golangci/golangci-lint-action/issues/362
- name: golangci-lint
Expand Down
8 changes: 4 additions & 4 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
run:
skip-dirs:
- test-cmds
timeout: 5m

linters:
Expand All @@ -15,7 +13,7 @@ linters:
- nakedret
- paralleltest
- revive
# - sloglint # TODO -- re-enable once golangci-lint bumps to sloglint v0.7.1
- sloglint
- sqlclosecheck
- staticcheck
- unconvert
Expand All @@ -28,7 +26,7 @@ linters:

linters-settings:
errcheck:
ignore: github.com/go-kit/kit/log:Log
exclude-functions: github.com/go-kit/kit/log:Log
gofmt:
simplify: false
forbidigo:
Expand Down Expand Up @@ -78,3 +76,5 @@ issues:
- linters:
- paralleltest
text: "does not use range value in test Run"
exclude-dirs:
- test-cmds
2 changes: 1 addition & 1 deletion ee/dataflatten/flatten.go
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ func (fl *Flattener) queryMatchArrayElement(data interface{}, arrIndex int, quer
"caller", "queryMatchArrayElement",
"rows_so_far", len(fl.rows),
"query", queryTerm,
"arrIndex", arrIndex,
"arr_index", arrIndex,
)

// strip off the key re-write denotation before trying to match
Expand Down

0 comments on commit 3204ad5

Please sign in to comment.