Skip to content

Commit f718e18

Browse files
authored
Merge branch 'main' into deps/bump-go
2 parents 3cd0fe9 + deab83e commit f718e18

12 files changed

+32
-75
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

.github/labeler.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
- name: Run GoReleaser
105105
uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6.0.0
106106
with:
107-
version: latest
107+
version: v2.2.0 # renovate: datasource=github-tags depName=goreleaser/goreleaser
108108
args: release --clean
109109
env:
110110
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555

5656
# Initializes the CodeQL tools for scanning.
5757
- name: Initialize CodeQL
58-
uses: github/codeql-action/init@f0f3afee809481da311ca3a6ff1ff51d81dbeb24 # v3.26.4
58+
uses: github/codeql-action/init@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
5959
with:
6060
languages: ${{ matrix.language }}
6161
build-mode: ${{ matrix.build-mode }}
@@ -67,6 +67,6 @@ jobs:
6767
# queries: security-extended,security-and-quality
6868

6969
- name: Perform CodeQL Analysis
70-
uses: github/codeql-action/analyze@f0f3afee809481da311ca3a6ff1ff51d81dbeb24 # v3.26.4
70+
uses: github/codeql-action/analyze@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
7171
with:
7272
category: "/language:${{matrix.language}}"

.github/workflows/dependabot-auto-merge.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

.github/workflows/labeler.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,15 @@ jobs:
1212
pull-requests: write # for actions/labeler to add labels
1313
runs-on: ubuntu-22.04
1414
steps:
15+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
16+
with:
17+
sparse-checkout: |
18+
labeler.yml
19+
sparse-checkout-cone-mode: false
20+
repository: nginxinc/k8s-common
21+
1522
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
1623
with:
1724
repo-token: "${{ secrets.GITHUB_TOKEN }}"
1825
sync-labels: true
26+
configuration-path: labeler.yml

.github/workflows/lint.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ jobs:
3131

3232
- name: Lint Go
3333
uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0
34+
with:
35+
version: v1.60.1 # renovate: datasource=github-tags depName=golangci/golangci-lint
3436

3537
actionlint:
3638
name: Actionlint

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ jobs:
5757

5858
# Upload the results to GitHub's code scanning dashboard.
5959
- name: "Upload to code-scanning"
60-
uses: github/codeql-action/upload-sarif@f0f3afee809481da311ca3a6ff1ff51d81dbeb24 # v3.26.4
60+
uses: github/codeql-action/upload-sarif@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
6161
with:
6262
sarif_file: results.sarif

.golangci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@ linters-settings:
3232
linters:
3333
enable:
3434
- asasalint
35-
- err113
3635
- asciicheck
3736
- bidichk
3837
- contextcheck
38+
- copyloopvar
3939
- dupword
4040
- durationcheck
41+
- err113
4142
- errcheck
4243
- errchkjson
4344
- errname
4445
- errorlint
45-
- exportloopref
4646
- fatcontext
4747
- forcetypeassert
4848
- gocheckcompilerdirectives

.pre-commit-config.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,20 @@ repos:
1111
- id: check-added-large-files
1212
- id: check-merge-conflict
1313
- id: check-shebang-scripts-are-executable
14+
- id: check-executables-have-shebangs
1415
- id: check-case-conflict
1516
- id: check-vcs-permalinks
17+
- id: check-json
18+
- id: pretty-format-json
19+
args: [--autofix, --no-ensure-ascii]
1620
- id: mixed-line-ending
1721
args: [--fix=lf]
1822
- id: no-commit-to-branch
1923
- id: fix-byte-order-marker
24+
- id: detect-private-key
2025

2126
- repo: https://github.com/golangci/golangci-lint
22-
rev: v1.60.1
27+
rev: v1.60.3
2328
hooks:
2429
- id: golangci-lint-full
2530

@@ -46,3 +51,4 @@ repos:
4651

4752
ci:
4853
skip: [golangci-lint-full]
54+
autoupdate_schedule: quarterly # We use renovate for more frequent updates and there's no way to disable autoupdate

0 commit comments

Comments
 (0)