Skip to content

Commit e6386c4

Browse files
dhurleydhurley
committed
Merge branch 'main' into release-3.6.2
2 parents ef838cb + 24ea31f commit e6386c4

25 files changed

+1363
-600
lines changed

‎.github/workflows/assertion.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
osarch: [amd64, arm64]
5555
steps:
5656
- name: Checkout Repository
57-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
57+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
5858

5959
- name: Set up Go
6060
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
@@ -64,7 +64,7 @@ jobs:
6464

6565
- name: Download nginx-agent binary artifacts
6666
if: ${{ inputs.runId != '' }}
67-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # 6.0.0
67+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # 7.0.0
6868
with:
6969
name: nginx-agent-binaries-${{ inputs.packageVersion }}-${{ matrix.osarch }}
7070
path: binaries

‎.github/workflows/ci.yml‎

Lines changed: 45 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
runs-on: ubuntu-22.04
2929
if: github.ref == 'refs/heads/main'
3030
steps:
31-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
31+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3232
with:
3333
fetch-tags: 'true'
3434
- name: Configure Go Proxy
@@ -47,7 +47,7 @@ jobs:
4747
run: go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${{ env.NFPM_VERSION }}
4848
- name: Fix golang dependency permissions
4949
run: chmod -R 0755 ~/go/pkg/mod ~/.cache/go-build
50-
- uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
50+
- uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
5151
with:
5252
path: |
5353
~/.cache/go-build
@@ -60,7 +60,7 @@ jobs:
6060
name: Lint
6161
runs-on: ubuntu-22.04
6262
steps:
63-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
63+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
6464
- name: Configure Go Proxy
6565
uses: ./.github/actions/configure-goproxy
6666
with:
@@ -71,24 +71,32 @@ jobs:
7171
with:
7272
go-version-file: 'go.mod'
7373
cache: false
74-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
74+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
7575
with:
7676
path: |
7777
~/.cache/go-build
7878
~/go/pkg/mod
7979
key: ${{ runner.os }}-go-
8080
- name: Lint Go
81-
uses: golangci/golangci-lint-action@e7fa5ac41e1cf5b7d48e45e42232ce7ada589601 # v9.1.0
81+
uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
8282
with:
8383
version: v2.4.0
8484

85+
vulnerability-scan:
86+
name: Vulnerability Scan
87+
uses: ./.github/workflows/vulncheck.yml
88+
permissions:
89+
security-events: write
90+
with:
91+
target-branch: ${{ github.event.pull_request.base.ref || github.ref_name }}
92+
8593
unit-test:
8694
name: Unit Tests
8795
runs-on: ubuntu-22.04
8896
permissions:
8997
contents: write
9098
steps:
91-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
99+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
92100
- name: Configure Go Proxy
93101
uses: ./.github/actions/configure-goproxy
94102
with:
@@ -99,7 +107,7 @@ jobs:
99107
with:
100108
go-version-file: 'go.mod'
101109
cache: false
102-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
110+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
103111
with:
104112
path: |
105113
~/.cache/go-build
@@ -108,7 +116,7 @@ jobs:
108116
- name: Run Unit Tests
109117
run: make unit-test
110118
- name: Uplaod Test Coverage
111-
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
119+
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
112120
with:
113121
files: ./build/test/coverage.out
114122
token: ${{ secrets.CODECOV_TOKEN }}
@@ -117,7 +125,7 @@ jobs:
117125
name: Unit tests with race condition detection
118126
runs-on: ubuntu-22.04
119127
steps:
120-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
128+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
121129
- name: Configure Go Proxy
122130
uses: ./.github/actions/configure-goproxy
123131
with:
@@ -128,7 +136,7 @@ jobs:
128136
with:
129137
go-version-file: 'go.mod'
130138
cache: false
131-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
139+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
132140
with:
133141
path: |
134142
~/.cache/go-build
@@ -141,7 +149,7 @@ jobs:
141149
name: Build Unsigned Snapshot
142150
runs-on: ubuntu-22.04
143151
steps:
144-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
152+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
145153
with:
146154
fetch-tags: 'true'
147155
- name: Configure Go Proxy
@@ -160,7 +168,7 @@ jobs:
160168
run: go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${{ env.NFPM_VERSION }}
161169
- name: Fix golang dependency permissions
162170
run: chmod -R 0755 ~/go/pkg/mod ~/.cache/go-build
163-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
171+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
164172
with:
165173
path: |
166174
~/.cache/go-build
@@ -170,7 +178,7 @@ jobs:
170178
run: |
171179
make clean local-deb-package local-rpm-package local-apk-package
172180
- name: Upload Artifacts
173-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
181+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
174182
with:
175183
name: nginx-agent-unsigned-snapshots
176184
path: build
@@ -190,7 +198,7 @@ jobs:
190198
- image: "alpine"
191199
version: "3.23"
192200
steps:
193-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
201+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
194202
- name: Configure Go Proxy
195203
uses: ./.github/actions/configure-goproxy
196204
with:
@@ -201,14 +209,14 @@ jobs:
201209
with:
202210
go-version-file: 'go.mod'
203211
cache: false
204-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
212+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
205213
with:
206214
path: |
207215
~/.cache/go-build
208216
~/go/pkg/mod
209217
key: ${{ runner.os }}-go-
210218
- name: Download Packages
211-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
219+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
212220
with:
213221
name: nginx-agent-unsigned-snapshots
214222
path: build
@@ -246,7 +254,7 @@ jobs:
246254
- image: "alpine"
247255
version: "3.22"
248256
steps:
249-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
257+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
250258
- name: Configure Go Proxy
251259
uses: ./.github/actions/configure-goproxy
252260
with:
@@ -257,14 +265,14 @@ jobs:
257265
with:
258266
go-version-file: 'go.mod'
259267
cache: false
260-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
268+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
261269
with:
262270
path: |
263271
~/.cache/go-build
264272
~/go/pkg/mod
265273
key: ${{ runner.os }}-go-
266274
- name: Download Packages
267-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
275+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
268276
with:
269277
name: nginx-agent-unsigned-snapshots
270278
path: build
@@ -309,7 +317,7 @@ jobs:
309317
version: "mainline"
310318
release: "alpine"
311319
steps:
312-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
320+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
313321
- name: Configure Go Proxy
314322
uses: ./.github/actions/configure-goproxy
315323
with:
@@ -320,14 +328,14 @@ jobs:
320328
with:
321329
go-version-file: 'go.mod'
322330
cache: false
323-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
331+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
324332
with:
325333
path: |
326334
~/.cache/go-build
327335
~/go/pkg/mod
328336
key: ${{ runner.os }}-go-
329337
- name: Download Packages
330-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
338+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
331339
with:
332340
name: nginx-agent-unsigned-snapshots
333341
path: build
@@ -382,7 +390,7 @@ jobs:
382390
release: "debian"
383391
path: "/nginx-plus/agent"
384392
steps:
385-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
393+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
386394
- name: Configure Go Proxy
387395
uses: ./.github/actions/configure-goproxy
388396
with:
@@ -393,14 +401,14 @@ jobs:
393401
with:
394402
go-version-file: 'go.mod'
395403
cache: false
396-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
404+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
397405
with:
398406
path: |
399407
~/.cache/go-build
400408
~/go/pkg/mod
401409
key: ${{ runner.os }}-go-
402410
- name: Download Packages
403-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
411+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
404412
with:
405413
name: nginx-agent-unsigned-snapshots
406414
path: build
@@ -454,7 +462,7 @@ jobs:
454462
version: "mainline"
455463
release: "alpine"
456464
steps:
457-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
465+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
458466
- name: Configure Go Proxy
459467
uses: ./.github/actions/configure-goproxy
460468
with:
@@ -465,14 +473,14 @@ jobs:
465473
with:
466474
go-version-file: 'go.mod'
467475
cache: false
468-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
476+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
469477
with:
470478
path: |
471479
~/.cache/go-build
472480
~/go/pkg/mod
473481
key: ${{ runner.os }}-go-
474482
- name: Download Packages
475-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
483+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
476484
with:
477485
name: nginx-agent-unsigned-snapshots
478486
path: build
@@ -527,7 +535,7 @@ jobs:
527535
release: "debian"
528536
path: "/nginx-plus/agent"
529537
steps:
530-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
538+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
531539
- name: Configure Go Proxy
532540
uses: ./.github/actions/configure-goproxy
533541
with:
@@ -538,14 +546,14 @@ jobs:
538546
with:
539547
go-version-file: 'go.mod'
540548
cache: false
541-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
549+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
542550
with:
543551
path: |
544552
~/.cache/go-build
545553
~/go/pkg/mod
546554
key: ${{ runner.os }}-go-
547555
- name: Download Packages
548-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
556+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
549557
with:
550558
name: nginx-agent-unsigned-snapshots
551559
path: build
@@ -585,7 +593,7 @@ jobs:
585593
permissions:
586594
contents: write
587595
steps:
588-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
596+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
589597
- name: Configure Go Proxy
590598
uses: ./.github/actions/configure-goproxy
591599
with:
@@ -596,7 +604,7 @@ jobs:
596604
with:
597605
go-version-file: 'go.mod'
598606
cache: false
599-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
607+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
600608
with:
601609
path: |
602610
~/.cache/go-build
@@ -629,21 +637,21 @@ jobs:
629637
runs-on: ubuntu-22.04
630638
needs: build-unsigned-snapshot
631639
steps:
632-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
640+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
633641
- uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
634642
with:
635643
go-version-file: 'go.mod'
636644
cache: false
637645

638-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
646+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
639647
with:
640648
path: |
641649
~/.cache/go-build
642650
~/go/pkg/mod
643651
key: ${{ runner.os }}-go-
644652

645653
- name: Download Packages
646-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
654+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
647655
with:
648656
name: nginx-agent-unsigned-snapshots
649657
path: build
@@ -679,7 +687,7 @@ jobs:
679687
echo "$results"
680688
681689
- name: Upload Load Test Results
682-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
690+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
683691
with:
684692
name: load-test-results
685693
path: benchmarks.json

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
docs_only: ${{ github.event.pull_request && steps.docs.outputs.docs_only == 'true' }}
3333
steps:
3434
- name: Checkout Repository
35-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
35+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3636
with:
3737
fetch-depth: 0
3838

‎.github/workflows/dependency-review.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
pull-requests: write # for actions/dependency-review-action to post comments
2323
steps:
2424
- name: "Checkout Repository"
25-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
25+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2626

2727
- name: "Dependency Review"
2828
uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2

‎.github/workflows/nightly-scans.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: nightly-scans.yml
2+
on:
3+
schedule:
4+
- cron: '0 2 * * *' # Runs daily at 2:00 AM UTC
5+
workflow_dispatch:
6+
7+
jobs:
8+
scan-main:
9+
name: Vulnerability Scan - Main
10+
uses: ./.github/workflows/vulncheck.yml
11+
with:
12+
target-branch: 'main'
13+
14+
scan-v2:
15+
name: Vulnerability Scan - dev-v2
16+
uses: ./.github/workflows/vulncheck.yml
17+
with:
18+
target-branch: 'dev-v2'

0 commit comments

Comments
 (0)