Skip to content

Commit 4a61966

Browse files
peaklepeakle
authored
Merge branch 'master' into fixInlineInMergeLineIssues
2 parents 7ac42b0 + 8e7ce22 commit 4a61966

File tree

274 files changed

+6075
-2193
lines changed

Some content is hidden

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

274 files changed

+6075
-2193
lines changed

‎.github/CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
See [contibuting quick start](https://golangci-lint.run/contributing/quick-start/) on our website.
1+
See [contributing quick start](https://golangci-lint.run/contributing/quick-start/) on our website.

‎.github/contributors/generate.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ const main = async () => {
124124
fossabot: true,
125125
golangcibot: true,
126126
kortschak: true,
127+
"golanci-releaser": true,
127128
}
128129

129130
const res: DataJSON = {

‎.github/workflows/post-release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v3
1414
- name: Install Go
15-
uses: actions/setup-go@v3
15+
uses: actions/setup-go@v4
1616
with:
1717
# https://github.com/actions/setup-go#supported-version-syntax
1818
# ex:
1919
# - 1.18beta1 -> 1.18.0-beta.1
2020
# - 1.18rc1 -> 1.18.0-rc.1
21-
go-version: 1.19
21+
go-version: '1.20'
2222

2323
- name: Update GitHub action config
2424
run: make assets/github-action-config.json
@@ -37,7 +37,7 @@ jobs:
3737
run: make update_netlify_state
3838

3939
- name: Create Pull Request
40-
uses: peter-evans/create-pull-request@v4
40+
uses: peter-evans/create-pull-request@v5
4141
with:
4242
base: master
4343
token: ${{ secrets.GOLANGCI_LINT_TOKEN }}

‎.github/workflows/pr-extra.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v3
14-
- uses: actions/setup-go@v3
14+
- uses: actions/setup-go@v4
1515
with:
1616
# https://github.com/actions/setup-go#supported-version-syntax
1717
# ex:
1818
# - 1.18beta1 -> 1.18.0-beta.1
1919
# - 1.18rc1 -> 1.18.0-rc.1
20-
go-version: 1.19
20+
go-version: '1.20'
2121
- name: Run go list
2222
run: go list -json -m all > go.list
2323
- name: Nancy
24-
uses: sonatype-nexus-community/nancy-github-action@v1.0.2
24+
uses: sonatype-nexus-community/nancy-github-action@v1.0.3

‎.github/workflows/pr.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ on:
66
pull_request:
77

88
env:
9-
GO_VERSION: 1.19
9+
GO_VERSION: '1.20'
1010

1111
jobs:
1212
# Check if there is any dirty change for go mod tidy
1313
go-mod:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Install Go
17-
uses: actions/setup-go@v3
17+
uses: actions/setup-go@v4
1818
with:
1919
# https://github.com/actions/setup-go#supported-version-syntax
2020
# ex:
@@ -35,15 +35,15 @@ jobs:
3535
steps:
3636
- uses: actions/checkout@v3
3737
- name: Install Go
38-
uses: actions/setup-go@v3
38+
uses: actions/setup-go@v4
3939
with:
4040
# https://github.com/actions/setup-go#supported-version-syntax
4141
# ex:
4242
# - 1.18beta1 -> 1.18.0-beta.1
4343
# - 1.18rc1 -> 1.18.0-rc.1
4444
go-version: ${{ env.GO_VERSION }}
4545
- name: lint
46-
uses: golangci/golangci-lint-action@v3.3.1
46+
uses: golangci/golangci-lint-action@v3.4.0
4747
with:
4848
version: latest
4949
# skip cache because of flaky behaviors
@@ -56,7 +56,7 @@ jobs:
5656
steps:
5757
- uses: actions/checkout@v3
5858
- name: Install Go
59-
uses: actions/setup-go@v3
59+
uses: actions/setup-go@v4
6060
with:
6161
# https://github.com/actions/setup-go#supported-version-syntax
6262
# ex:
@@ -72,7 +72,7 @@ jobs:
7272
steps:
7373
- uses: actions/checkout@v3
7474
- name: Install Go
75-
uses: actions/setup-go@v3
75+
uses: actions/setup-go@v4
7676
with:
7777
# https://github.com/actions/setup-go#supported-version-syntax
7878
# ex:
@@ -88,12 +88,12 @@ jobs:
8888
strategy:
8989
matrix:
9090
golang:
91-
- 1.18
9291
- 1.19
92+
- '1.20'
9393
steps:
9494
- uses: actions/checkout@v3
9595
- name: Install Go
96-
uses: actions/setup-go@v3
96+
uses: actions/setup-go@v4
9797
with:
9898
# https://github.com/actions/setup-go#supported-version-syntax
9999
# ex:
@@ -120,7 +120,7 @@ jobs:
120120
- name: Unshallow
121121
run: git fetch --prune --unshallow
122122
- name: Install Go
123-
uses: actions/setup-go@v3
123+
uses: actions/setup-go@v4
124124
with:
125125
# https://github.com/actions/setup-go#supported-version-syntax
126126
# ex:

‎.github/workflows/tag.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v3
1414
- name: Install Go
15-
uses: actions/setup-go@v3
15+
uses: actions/setup-go@v4
1616
with:
1717
# https://github.com/actions/setup-go#supported-version-syntax
1818
# ex:
1919
# - 1.18beta1 -> 1.18.0-beta.1
2020
# - 1.18rc1 -> 1.18.0-rc.1
21-
go-version: 1.19
21+
go-version: '1.20'
2222
- name: Unshallow
2323
run: git fetch --prune --unshallow
2424

@@ -42,13 +42,13 @@ jobs:
4242
- uses: actions/checkout@v3
4343

4444
- name: Install Go
45-
uses: actions/setup-go@v3
45+
uses: actions/setup-go@v4
4646
with:
4747
# https://github.com/actions/setup-go#supported-version-syntax
4848
# ex:
4949
# - 1.18beta1 -> 1.18.0-beta.1
5050
# - 1.18rc1 -> 1.18.0-rc.1
51-
go-version: 1.19
51+
go-version: '1.20'
5252

5353
- name: Unshallow
5454
run: git fetch --prune --unshallow
@@ -60,18 +60,18 @@ jobs:
6060
MAJOR=${TAG%.*}
6161
SHORT_COMMIT=${GITHUB_SHA::8}
6262
DATE=$(date '+%Y-%m-%dT%H:%M:%SZ')
63-
echo ::set-output name=tag_name::${TAG}
64-
echo ::set-output name=major_tag::${MAJOR}
65-
echo ::set-output name=short_commit::${SHORT_COMMIT}
66-
echo ::set-output name=date::${DATE}
63+
echo tag_name=${TAG} >> $GITHUB_OUTPUT
64+
echo major_tag=${MAJOR} >> $GITHUB_OUTPUT
65+
echo short_commit=${SHORT_COMMIT} >> $GITHUB_OUTPUT
66+
echo date=${DATE} >> $GITHUB_OUTPUT
6767
if [[ ${{ matrix.target.Dockerfile }} == *"alpine"* ]]; then
68-
echo ::set-output name=full_tag_name::${TAG}-alpine
69-
echo ::set-output name=full_major_tag::${MAJOR}-alpine
70-
echo ::set-output name=latest_tag::latest-alpine
68+
echo full_tag_name=${TAG}-alpine >> $GITHUB_OUTPUT
69+
echo full_major_tag=${MAJOR}-alpine >> $GITHUB_OUTPUT
70+
echo latest_tag=latest-alpine >> $GITHUB_OUTPUT
7171
else
72-
echo ::set-output name=full_tag_name::${TAG}
73-
echo ::set-output name=full_major_tag::${MAJOR}
74-
echo ::set-output name=latest_tag::latest
72+
echo full_tag_name=${TAG} >> $GITHUB_OUTPUT
73+
echo full_major_tag=${MAJOR} >> $GITHUB_OUTPUT
74+
echo latest_tag=latest >> $GITHUB_OUTPUT
7575
fi
7676
7777
- name: Set up QEMU
@@ -84,7 +84,7 @@ jobs:
8484
run: docker login -u golangci -p ${{ secrets.GOLANGCI_LINT_DOCKER_TOKEN }}
8585

8686
- name: Build and publish ${{ matrix.target.Dockerfile }}
87-
uses: docker/build-push-action@v3
87+
uses: docker/build-push-action@v4
8888
with:
8989
context: .
9090
file: ${{ matrix.target.Dockerfile }}

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
/.vscode/
88
/dist/
99
/golangci-lint
10+
/golangci-lint.exe
1011
/test/path
1112
/tools/Dracula.itermcolors
1213
/tools/dist/

0 commit comments

Comments
 (0)