Skip to content

Commit d01e5ac

Browse files
authored
Merge branch 'golangci:main' into gofuncor
2 parents 033e7be + 76c48dd commit d01e5ac

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+4946
-4274
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ body:
4040
- RPM
4141
- Other Linux package manager
4242
- Via editor/IDE
43+
- asdf/mise-en-place
4344
- Other
4445
validations:
4546
required: true

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ body:
3535
- RPM
3636
- Other Linux package manager
3737
- Via editor/IDE
38+
- asdf/mise-en-place
3839
- Other
3940
validations:
4041
required: true

.github/workflows/post-release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ jobs:
6363
branch-suffix: timestamp
6464
title: "docs: update documentation assets"
6565
delete-branch: true
66+
body: |
67+
- [ ] update changelog
68+
- [ ] add previous version JSON Schema
6669
6770
check-install-script:
6871
name: Installation script (remote)

.github/workflows/pr-checks.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ jobs:
8888
- run: ./golangci-lint config
8989
- run: ./golangci-lint config path
9090
- run: ./golangci-lint config path --json
91-
# TODO(ldez) after v2: golangci.next.jsonschema.json -> golangci.jsonschema.json
9291
- run: ./golangci-lint config verify --schema jsonschema/golangci.next.jsonschema.json
9392

9493
- run: ./golangci-lint help

.github/workflows/pr-tests.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,10 @@ jobs:
4040
# - 1.18beta1 -> 1.18.0-beta.1
4141
# - 1.18rc1 -> 1.18.0-rc.1
4242
go-version: ${{ env.GO_VERSION }}
43-
# TODO(ldez): must add uncommented when [email protected] (with golangci-lint v2 support) will be created.
44-
# - name: lint
45-
# uses: golangci/[email protected]
46-
# with:
47-
# version: latest
43+
- name: lint
44+
uses: golangci/[email protected]
45+
with:
46+
version: latest
4847

4948
tests-on-windows:
5049
needs: golangci-lint # run after golangci-lint action to not produce duplicated errors

.golangci.next.reference.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -415,11 +415,12 @@ linters:
415415
# if check-error-free-encoding is set to true and errcheck linter is enabled,
416416
# it is recommended to add the following exceptions to prevent from false positives:
417417
#
418-
# linters-settings:
419-
# errcheck:
420-
# exclude-functions:
421-
# - encoding/json.Marshal
422-
# - encoding/json.MarshalIndent
418+
# linters:
419+
# settings:
420+
# errcheck:
421+
# exclude-functions:
422+
# - encoding/json.Marshal
423+
# - encoding/json.MarshalIndent
423424
#
424425
# Default: false
425426
check-error-free-encoding: true
@@ -544,8 +545,8 @@ linters:
544545
# Default: 40
545546
statements: -1
546547
# Ignore comments when counting lines.
547-
# Default false
548-
ignore-comments: true
548+
# Default: true
549+
ignore-comments: false
549550

550551
ginkgolinter:
551552
# Suppress the wrong length assertion warning.

0 commit comments

Comments
 (0)