Skip to content

Commit 623930f

Browse files
authored
Merge branch 'main' into proposal/authentication-filter
2 parents 7c7dc79 + 3934c5c commit 623930f

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ jobs:
193193
fail-build: false
194194

195195
- name: Upload scan result to GitHub Security tab
196-
uses: github/codeql-action/upload-sarif@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
196+
uses: github/codeql-action/upload-sarif@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
197197
if: ${{ !inputs.dry_run }}
198198
continue-on-error: true
199199
with:

.github/workflows/scorecards.yml

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

6161
# Upload the results to GitHub's code scanning dashboard.
6262
- name: "Upload to code-scanning"
63-
uses: github/codeql-action/upload-sarif@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
63+
uses: github/codeql-action/upload-sarif@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
6464
with:
6565
sarif_file: results.sarif

internal/controller/nginx/modules/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/controller/nginx/modules/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"clean": "rm -rf node_modules coverage"
1111
},
1212
"devDependencies": {
13-
"@vitest/coverage-v8": "^4.0.10",
13+
"@vitest/coverage-v8": "^4.0.13",
1414
"prettier": "3.6.2",
15-
"vitest": "^4.0.10"
15+
"vitest": "^4.0.13"
1616
},
1717
"type": "module"
1818
}

tests/framework/collector.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const (
1313
collectorChartReleaseName = "otel-collector"
1414
//nolint:lll
1515
// renovate: datasource=helm depName=opentelemetry-collector registryUrl=https://open-telemetry.github.io/opentelemetry-helm-charts
16-
collectorChartVersion = "0.139.0"
16+
collectorChartVersion = "0.140.0"
1717
)
1818

1919
// InstallCollector installs the otel-collector.

0 commit comments

Comments
 (0)