Skip to content

Commit 0bd493b

Browse files
committed
Merge branch 'master' into 'main'
2 parents 23679e1 + 8cffdb7 commit 0bd493b

35 files changed

+623
-164
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

+26
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,32 @@ body:
1818
- label: I agree to follow this project's [Code of Conduct](https://github.com/golangci/golangci-lint?tab=coc-ov-file)
1919
required: true
2020

21+
- type: dropdown
22+
id: install
23+
attributes:
24+
label: How did you install golangci-lint?
25+
options:
26+
- I don't know
27+
- Official GitHub Action
28+
- Official binary
29+
- Brew
30+
- MacPorts
31+
- Chocolatey
32+
- Scoop
33+
- Docker
34+
- go install
35+
- Tools pattern
36+
- go tool
37+
- AUR
38+
- Nix
39+
- Deb
40+
- RPM
41+
- Other Linux package manager
42+
- Via editor/IDE
43+
- Other
44+
validations:
45+
required: true
46+
2147
- type: textarea
2248
id: problem
2349
attributes:

.github/ISSUE_TEMPLATE/feature_request.yml

+26
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,32 @@ body:
1313
- label: I agree to follow this project's [Code of Conduct](https://github.com/golangci/golangci-lint?tab=coc-ov-file)
1414
required: true
1515

16+
- type: dropdown
17+
id: install
18+
attributes:
19+
label: How did you install golangci-lint?
20+
options:
21+
- I don't know
22+
- Official GitHub Action
23+
- Official binary
24+
- Brew
25+
- MacPorts
26+
- Chocolatey
27+
- Scoop
28+
- Docker
29+
- go install
30+
- Tools pattern
31+
- go tool
32+
- AUR
33+
- Nix
34+
- Deb
35+
- RPM
36+
- Other Linux package manager
37+
- Via editor/IDE
38+
- Other
39+
validations:
40+
required: true
41+
1642
- type: textarea
1743
id: problem
1844
attributes:

.golangci.next.reference.yml

+26-20
Original file line numberDiff line numberDiff line change
@@ -1238,27 +1238,25 @@ linters:
12381238
# Define here regexp type values.
12391239
# for example:
12401240
AUTHOR: .*@mycompany\.com
1241-
# The template use for checking.
1241+
# The template used for checking.
1242+
# Put here copyright header template for source code files
1243+
# Note: {{ YEAR }} is a builtin value that returns the year relative to the current machine time.
12421244
# Default: ""
12431245
template: |-
1244-
# Put here copyright header template for source code files
1245-
# For example:
1246-
# Note: {{ YEAR }} is a builtin value that returns the year relative to the current machine time.
1247-
#
1248-
# {{ AUTHOR }} {{ COMPANY }} {{ YEAR }}
1249-
# SPDX-License-Identifier: Apache-2.0
1250-
1251-
# Licensed under the Apache License, Version 2.0 (the "License");
1252-
# you may not use this file except in compliance with the License.
1253-
# You may obtain a copy of the License at:
1254-
1255-
# http://www.apache.org/licenses/LICENSE-2.0
1256-
1257-
# Unless required by applicable law or agreed to in writing, software
1258-
# distributed under the License is distributed on an "AS IS" BASIS,
1259-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1260-
# See the License for the specific language governing permissions and
1261-
# limitations under the License.
1246+
{{ AUTHOR }} {{ COMPANY }} {{ YEAR }}
1247+
SPDX-License-Identifier: Apache-2.0
1248+
1249+
Licensed under the Apache License, Version 2.0 (the "License");
1250+
you may not use this file except in compliance with the License.
1251+
You may obtain a copy of the License at:
1252+
1253+
http://www.apache.org/licenses/LICENSE-2.0
1254+
1255+
Unless required by applicable law or agreed to in writing, software
1256+
distributed under the License is distributed on an "AS IS" BASIS,
1257+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1258+
See the License for the specific language governing permissions and
1259+
limitations under the License.
12621260
# As alternative of directive 'template', you may put the path to file with the template source.
12631261
# Useful if you need to load the template from a specific file.
12641262
# By default, if a path is relative, it is relative to the directory where the golangci-lint command is executed.
@@ -2153,6 +2151,12 @@ linters:
21532151
# Default: false
21542152
enable-all-rules: true
21552153

2154+
# Enable validation of comment directives.
2155+
# See https://github.com/mgechev/revive#comment-directives
2156+
directives:
2157+
- name: specify-disable-reason
2158+
severity: error
2159+
21562160
# Sets the default failure confidence.
21572161
# This means that linting errors with less than 0.8 confidence will be ignored.
21582162
# Default: 0.8
@@ -2341,6 +2345,8 @@ linters:
23412345
severity: warning
23422346
disabled: false
23432347
exclude: [""]
2348+
arguments:
2349+
- "xerrors.New"
23442350
# https://github.com/mgechev/revive/blob/HEAD/RULES_DESCRIPTIONS.md#errorf
23452351
- name: errorf
23462352
severity: warning
@@ -4144,7 +4150,7 @@ output:
41444150

41454151
# Options for analysis running.
41464152
run:
4147-
# Timeout for total work, e.g. 30s, 5m.
4153+
# Timeout for total work, e.g. 30s, 5m, 5m30s.
41484154
# If the value is lower or equal to 0, the timeout is disabled.
41494155
# Default: 0 (disabled)
41504156
timeout: 5m

.golangci.reference.yml

+27-21
Original file line numberDiff line numberDiff line change
@@ -1286,7 +1286,7 @@ linters-settings:
12861286
min-complexity: 10
12871287

12881288
godot:
1289-
# Comments to be checked: `declarations`, `toplevel`, or `all`.
1289+
# Comments to be checked: `declarations`, `toplevel`, `noinline` or `all`.
12901290
# Default: declarations
12911291
scope: toplevel
12921292
# List of regexps for excluding particular comment lines from check.
@@ -1346,27 +1346,25 @@ linters-settings:
13461346
# Define here regexp type values.
13471347
# for example:
13481348
AUTHOR: .*@mycompany\.com
1349-
# The template use for checking.
1349+
# The template used for checking.
1350+
# Put here copyright header template for source code files
1351+
# Note: {{ YEAR }} is a builtin value that returns the year relative to the current machine time.
13501352
# Default: ""
13511353
template: |-
1352-
# Put here copyright header template for source code files
1353-
# For example:
1354-
# Note: {{ YEAR }} is a builtin value that returns the year relative to the current machine time.
1355-
#
1356-
# {{ AUTHOR }} {{ COMPANY }} {{ YEAR }}
1357-
# SPDX-License-Identifier: Apache-2.0
1358-
1359-
# Licensed under the Apache License, Version 2.0 (the "License");
1360-
# you may not use this file except in compliance with the License.
1361-
# You may obtain a copy of the License at:
1362-
1363-
# http://www.apache.org/licenses/LICENSE-2.0
1364-
1365-
# Unless required by applicable law or agreed to in writing, software
1366-
# distributed under the License is distributed on an "AS IS" BASIS,
1367-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1368-
# See the License for the specific language governing permissions and
1369-
# limitations under the License.
1354+
{{ AUTHOR }} {{ COMPANY }} {{ YEAR }}
1355+
SPDX-License-Identifier: Apache-2.0
1356+
1357+
Licensed under the Apache License, Version 2.0 (the "License");
1358+
you may not use this file except in compliance with the License.
1359+
You may obtain a copy of the License at:
1360+
1361+
http://www.apache.org/licenses/LICENSE-2.0
1362+
1363+
Unless required by applicable law or agreed to in writing, software
1364+
distributed under the License is distributed on an "AS IS" BASIS,
1365+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1366+
See the License for the specific language governing permissions and
1367+
limitations under the License.
13701368
# As alternative of directive 'template', you may put the path to file with the template source.
13711369
# Useful if you need to load the template from a specific file.
13721370
# Default: ""
@@ -2386,6 +2384,12 @@ linters-settings:
23862384
# Default: false
23872385
enable-all-rules: true
23882386

2387+
# Enable validation of comment directives.
2388+
# See https://github.com/mgechev/revive#comment-directives
2389+
directives:
2390+
- name: specify-disable-reason
2391+
severity: error
2392+
23892393
# Sets the default failure confidence.
23902394
# This means that linting errors with less than 0.8 confidence will be ignored.
23912395
# Default: 0.8
@@ -2574,6 +2578,8 @@ linters-settings:
25742578
severity: warning
25752579
disabled: false
25762580
exclude: [""]
2581+
arguments:
2582+
- "xerrors.New"
25772583
# https://github.com/mgechev/revive/blob/HEAD/RULES_DESCRIPTIONS.md#errorf
25782584
- name: errorf
25792585
severity: warning
@@ -4153,7 +4159,7 @@ output:
41534159

41544160
# Options for analysis running.
41554161
run:
4156-
# Timeout for analysis, e.g. 30s, 5m.
4162+
# Timeout for analysis, e.g. 30s, 5m, 5m30s.
41574163
# If the value is lower or equal to 0, the timeout is disabled.
41584164
# Default: 1m
41594165
timeout: 5m

CHANGELOG.md

+16
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,21 @@ If you value it, consider supporting us, we appreciate it! ❤️
77
[![Open Collective backers and sponsors](https://img.shields.io/badge/OpenCollective-Donate-blue?logo=opencollective&style=for-the-badge)](https://opencollective.com/golangci-lint)
88
[![GitHub Sponsors](https://img.shields.io/badge/GitHub-Donate-blue?logo=github&style=for-the-badge)](https://github.com/sponsors/golangci)
99

10+
### v1.64.6
11+
12+
1. Linters bug fixes
13+
* `asciicheck`: from 0.4.0 to 0.4.1
14+
* `contextcheck`: from 1.1.5 to 1.1.6
15+
* `errcheck`: from 1.8.0 to 1.9.0
16+
* `exptostd`: from 0.4.1 to 0.4.2
17+
* `ginkgolinter`: from 0.19.0 to 0.19.1
18+
* `go-exhaustruct`: from 3.3.0 to 3.3.1
19+
* `gocheckcompilerdirectives`: from 1.2.1 to 1.3.0
20+
* `godot`: from 1.4.20 to 1.5.0
21+
* `perfsprint`: from 0.8.1 to 0.8.2
22+
* `revive`: from 1.6.1 to 1.7.0
23+
* `tagalign`: from 1.4.1 to 1.4.2
24+
1025
### v1.64.5
1126

1227
1. Bug fixes
@@ -59,6 +74,7 @@ The next release will be golangci-lint [v2](https://github.com/golangci/golangci
5974
* `staticcheck`: from 0.5.1 to 0.6.0
6075
4. Deprecations
6176
* ⚠️ `tenv` is deprecated and replaced by `usetesting.os-setenv: true`.
77+
* ⚠️ `exportloopref` deprecation step 2
6278
5. Misc.
6379
* Sanitize severities by output format
6480
* Avoid panic with plugin without description

README.md

+7
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,13 @@ This project exists thanks to all the people who contribute. [How to contribute]
5353
<img src="https://opencollective.com/golangci-lint/contributors.svg?width=890&button=false&skip=golangcidev,CLAassistant,renovate,fossabot,golangcibot,kortschak,golangci-releaser,dependabot%5Bbot%5D" />
5454
</a>
5555

56+
## Sponsors
57+
58+
<p>&nbsp;</p>
59+
<p float="left">
60+
<a href="https://www.jetbrains.com/go/?utm_source=OSS&utm_medium=referral&utm_campaign=golangci" target="_blank"><img src="assets/goland.svg" width="150" alt="The complete IDE crafted for professional Go developers."></a>
61+
</p>
62+
5663
## Stargazers over time
5764

5865
[![Stargazers over time](https://starchart.cc/golangci/golangci-lint.svg)](https://starchart.cc/golangci/golangci-lint)

assets/goland.svg

+20
Loading

0 commit comments

Comments
 (0)