Skip to content

Commit 2db3b60

Browse files
committed
merge from main
2 parents 26c7b59 + 23b485e commit 2db3b60

18 files changed

+149
-96
lines changed

.github/dependabot.yml

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

.github/labeler.yml

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

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
strategy:
3333
fail-fast: false
3434
matrix:
35-
go-version: ["1.21", stable]
35+
go-version: ["1.21", "1.22", stable]
3636
steps:
3737
- name: Checkout Repository
3838
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
@@ -65,10 +65,10 @@ jobs:
6565
sed -i 's|\${NGINX_PLUS_VERSION}/||g' docker/Dockerfile
6666
6767
- name: Set up Docker Buildx
68-
uses: docker/setup-buildx-action@aa33708b10e362ff993539393ff100fa93ed6a27 # v3.5.0
68+
uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
6969

7070
- name: Build Plus Docker Image
71-
uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 # v6.5.0
71+
uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0
7272
with:
7373
file: docker/Dockerfile
7474
tags: nginx-plus
@@ -86,7 +86,7 @@ jobs:
8686
run: docker compose up test-no-stream --exit-code-from test-no-stream
8787

8888
- name: Create/Update Draft
89-
uses: lucacome/draft-release@8a63d32c79a171ae6048e614a8988f0ac3ed56d4 # v1.1.0
89+
uses: lucacome/draft-release@5d29432a46bff6c122cd4b07a1fb94e1bb158d34 # v1.1.1
9090
id: release-notes
9191
with:
9292
minor-label: "enhancement"
@@ -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@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
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@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
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/fossa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ jobs:
2424
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
2525

2626
- name: Scan
27-
uses: fossas/fossa-action@47ef11b1e1e3812e88dae436ccbd2d0cbd1adab0 # v1.3.3
27+
uses: fossas/fossa-action@09bcf127dc0ccb4b5a023f6f906728878e8610ba # v1.4.0
2828
with:
2929
api-key: ${{ secrets.FOSSA_TOKEN }}

.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: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ jobs:
3030
go-version: stable
3131

3232
- name: Lint Go
33-
uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1
33+
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
persist-credentials: false
3232

3333
- name: "Run analysis"
34-
uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
34+
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
3535
with:
3636
results_file: results.sarif
3737
results_format: sarif
@@ -49,14 +49,14 @@ jobs:
4949
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
5050
# format to the repository Actions tab.
5151
- name: "Upload artifact"
52-
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
52+
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
5353
with:
5454
name: SARIF file
5555
path: results.sarif
5656
retention-days: 5
5757

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

.golangci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,14 @@ linters:
3535
- asciicheck
3636
- bidichk
3737
- contextcheck
38+
- copyloopvar
3839
- dupword
3940
- durationcheck
41+
- err113
4042
- errcheck
4143
- errchkjson
4244
- errname
4345
- errorlint
44-
- exportloopref
4546
- fatcontext
4647
- forcetypeassert
4748
- gocheckcompilerdirectives

0 commit comments

Comments
 (0)