Skip to content

Commit a9bdd24

Browse files
dhurleydhurley
committed
Merge branch 'main' into add-weaver-support
2 parents eb9c7d5 + 6cbcd8b commit a9bdd24

File tree

18 files changed

+186
-109
lines changed

18 files changed

+186
-109
lines changed

‎.github/workflows/assertion.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -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
@@ -71,7 +71,7 @@ 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
@@ -108,7 +108,7 @@ jobs:
108108
with:
109109
go-version-file: 'go.mod'
110110
cache: false
111-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
111+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
112112
with:
113113
path: |
114114
~/.cache/go-build
@@ -117,7 +117,7 @@ jobs:
117117
- name: Run Unit Tests
118118
run: make unit-test
119119
- name: Uplaod Test Coverage
120-
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
120+
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
121121
with:
122122
files: ./build/test/coverage.out
123123
token: ${{ secrets.CODECOV_TOKEN }}
@@ -137,7 +137,7 @@ jobs:
137137
with:
138138
go-version-file: 'go.mod'
139139
cache: false
140-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
140+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
141141
with:
142142
path: |
143143
~/.cache/go-build
@@ -169,7 +169,7 @@ jobs:
169169
run: go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${{ env.NFPM_VERSION }}
170170
- name: Fix golang dependency permissions
171171
run: chmod -R 0755 ~/go/pkg/mod ~/.cache/go-build
172-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
172+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
173173
with:
174174
path: |
175175
~/.cache/go-build
@@ -179,7 +179,7 @@ jobs:
179179
run: |
180180
make clean local-deb-package local-rpm-package local-apk-package
181181
- name: Upload Artifacts
182-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
182+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
183183
with:
184184
name: nginx-agent-unsigned-snapshots
185185
path: build
@@ -197,7 +197,7 @@ jobs:
197197
- image: "redhatenterprise"
198198
version: "9"
199199
- image: "alpine"
200-
version: "3.22"
200+
version: "3.23"
201201
steps:
202202
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
203203
- name: Configure Go Proxy
@@ -210,14 +210,14 @@ jobs:
210210
with:
211211
go-version-file: 'go.mod'
212212
cache: false
213-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
213+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
214214
with:
215215
path: |
216216
~/.cache/go-build
217217
~/go/pkg/mod
218218
key: ${{ runner.os }}-go-
219219
- name: Download Packages
220-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
220+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
221221
with:
222222
name: nginx-agent-unsigned-snapshots
223223
path: build
@@ -266,14 +266,14 @@ jobs:
266266
with:
267267
go-version-file: 'go.mod'
268268
cache: false
269-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
269+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
270270
with:
271271
path: |
272272
~/.cache/go-build
273273
~/go/pkg/mod
274274
key: ${{ runner.os }}-go-
275275
- name: Download Packages
276-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
276+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
277277
with:
278278
name: nginx-agent-unsigned-snapshots
279279
path: build
@@ -329,14 +329,14 @@ jobs:
329329
with:
330330
go-version-file: 'go.mod'
331331
cache: false
332-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
332+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
333333
with:
334334
path: |
335335
~/.cache/go-build
336336
~/go/pkg/mod
337337
key: ${{ runner.os }}-go-
338338
- name: Download Packages
339-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
339+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
340340
with:
341341
name: nginx-agent-unsigned-snapshots
342342
path: build
@@ -402,14 +402,14 @@ jobs:
402402
with:
403403
go-version-file: 'go.mod'
404404
cache: false
405-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
405+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
406406
with:
407407
path: |
408408
~/.cache/go-build
409409
~/go/pkg/mod
410410
key: ${{ runner.os }}-go-
411411
- name: Download Packages
412-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
412+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
413413
with:
414414
name: nginx-agent-unsigned-snapshots
415415
path: build
@@ -474,14 +474,14 @@ jobs:
474474
with:
475475
go-version-file: 'go.mod'
476476
cache: false
477-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
477+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
478478
with:
479479
path: |
480480
~/.cache/go-build
481481
~/go/pkg/mod
482482
key: ${{ runner.os }}-go-
483483
- name: Download Packages
484-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
484+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
485485
with:
486486
name: nginx-agent-unsigned-snapshots
487487
path: build
@@ -547,14 +547,14 @@ jobs:
547547
with:
548548
go-version-file: 'go.mod'
549549
cache: false
550-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
550+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
551551
with:
552552
path: |
553553
~/.cache/go-build
554554
~/go/pkg/mod
555555
key: ${{ runner.os }}-go-
556556
- name: Download Packages
557-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
557+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
558558
with:
559559
name: nginx-agent-unsigned-snapshots
560560
path: build
@@ -605,7 +605,7 @@ jobs:
605605
with:
606606
go-version-file: 'go.mod'
607607
cache: false
608-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
608+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
609609
with:
610610
path: |
611611
~/.cache/go-build
@@ -644,15 +644,15 @@ jobs:
644644
go-version-file: 'go.mod'
645645
cache: false
646646

647-
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
647+
- uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
648648
with:
649649
path: |
650650
~/.cache/go-build
651651
~/go/pkg/mod
652652
key: ${{ runner.os }}-go-
653653

654654
- name: Download Packages
655-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
655+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
656656
with:
657657
name: nginx-agent-unsigned-snapshots
658658
path: build
@@ -688,7 +688,7 @@ jobs:
688688
echo "$results"
689689
690690
- name: Upload Load Test Results
691-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
691+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
692692
with:
693693
name: load-test-results
694694
path: benchmarks.json

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ jobs:
246246
find build/ -type f -name "nginx-agent*"
247247
248248
- name: Archive AMD64 Binaries
249-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
249+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
250250
with:
251251
name: nginx-agent-binaries-${{ inputs.packageVersion }}-amd64
252252
path: |
@@ -256,7 +256,7 @@ jobs:
256256
build/amd64/nginx-agent.buildend
257257
258258
- name: Archive ARM64 Binaries
259-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
259+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
260260
with:
261261
name: nginx-agent-binaries-${{ inputs.packageVersion }}-arm64
262262
path: |

‎.github/workflows/scorecards.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ jobs:
4747
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
4848
# format to the repository Actions tab.
4949
- name: "Upload artifact"
50-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
50+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
5151
with:
5252
name: SARIF file
5353
path: results.sarif
5454
retention-days: 5
5555

5656
# Upload the results to GitHub's code scanning dashboard.
5757
- name: "Upload to code-scanning"
58-
uses: github/codeql-action/upload-sarif@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
58+
uses: github/codeql-action/upload-sarif@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
5959
with:
6060
sarif_file: results.sarif

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ GOBIN ?= $$(go env GOPATH)/bin
2222
# | redhatenterprise | 8, 9, 10 | |
2323
# | rockylinux | 8, 9, 10 | |
2424
# | almalinux | 8, 9, 10 | |
25-
# | alpine | 3.20, 3.21 3.22 | |
25+
# | alpine | 3.20, 3.21 3.22 3.23 | |
2626
# | oraclelinux | 8, 9, 10 | |
2727
# | suse | sle15, sle16 | |
2828
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

‎Makefile.packaging‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RPM_DISTROS ?= suse-15-x86_64 suse-16-x86_64
1818
RPM_ARCH := x86_64
1919
REDHAT_VERSIONS ?= redhatenterprise-8 redhatenterprise-9 redhatenterprise-10
2020
REDHAT_ARCHS ?= aarch64 x86_64
21-
APK_VERSIONS ?= 3.20 3.21 3.22
21+
APK_VERSIONS ?= 3.20 3.21 3.22 3.23
2222
APK_ARCHS ?= aarch64 x86_64
2323
APK_REVISION ?= 1
2424
AMAZON_VERSIONS ?= amazon-2 amazon-2023

‎api/grpc/mpi/v1/command.pb.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/grpc/mpi/v1/common.pb.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/grpc/mpi/v1/files.pb.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.9-20250912141014-52f32327d4b0.1
99
buf.build/go/protovalidate v1.0.0
1010
github.com/cenkalti/backoff/v4 v4.3.0
11-
github.com/docker/docker v28.5.1+incompatible
11+
github.com/docker/docker v28.5.2+incompatible
1212
github.com/fsnotify/fsnotify v1.9.0
1313
github.com/go-resty/resty/v2 v2.16.5
1414
github.com/goccy/go-yaml v1.18.0
@@ -40,7 +40,7 @@ require (
4040
github.com/open-telemetry/opentelemetry-collector-contrib/testbed v0.141.0
4141
github.com/prometheus/client_model v0.6.2
4242
github.com/prometheus/common v0.67.4
43-
github.com/shirou/gopsutil/v4 v4.25.10
43+
github.com/shirou/gopsutil/v4 v4.25.11
4444
github.com/spf13/pflag v1.0.10
4545
github.com/stretchr/testify v1.11.1
4646
github.com/testcontainers/testcontainers-go v0.40.0
@@ -144,10 +144,10 @@ require (
144144
github.com/docker/go-connections v0.6.0 // indirect
145145
github.com/docker/go-units v0.5.0 // indirect
146146
github.com/dustin/go-humanize v1.0.1 // indirect
147-
github.com/ebitengine/purego v0.9.0 // indirect
147+
github.com/ebitengine/purego v0.9.1 // indirect
148148
github.com/elastic/go-grok v0.3.1 // indirect
149149
github.com/elastic/lunes v0.2.0 // indirect
150-
github.com/expr-lang/expr v1.17.6 // indirect
150+
github.com/expr-lang/expr v1.17.7 // indirect
151151
github.com/felixge/httpsnoop v1.0.4 // indirect
152152
github.com/foxboron/go-tpm-keyfiles v0.0.0-20250903184740-5d135037bd4d // indirect
153153
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
@@ -271,8 +271,8 @@ require (
271271
github.com/stretchr/objx v0.5.2 // indirect
272272
github.com/subosito/gotenv v1.6.0 // indirect
273273
github.com/tilinna/clock v1.1.0 // indirect
274-
github.com/tklauser/go-sysconf v0.3.15 // indirect
275-
github.com/tklauser/numcpus v0.10.0 // indirect
274+
github.com/tklauser/go-sysconf v0.3.16 // indirect
275+
github.com/tklauser/numcpus v0.11.0 // indirect
276276
github.com/trivago/tgo v1.0.7 // indirect
277277
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
278278
github.com/twmb/murmur3 v1.1.8 // indirect
@@ -379,7 +379,7 @@ require (
379379
github.com/nginxinc/nginx-go-crossplane v0.4.84
380380
github.com/prometheus/client_golang v1.23.2 // indirect
381381
github.com/samber/slog-gin v1.17.2
382-
github.com/spf13/cobra v1.10.1
382+
github.com/spf13/cobra v1.10.2
383383
github.com/spf13/viper v1.21.0
384384
github.com/vardius/message-bus v1.1.5
385385
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.38.0 // indirect

0 commit comments

Comments
 (0)