Skip to content

Commit b86c557

Browse files
authored
Merge branch 'main' into feat-34427
2 parents 390d99a + 847c9c6 commit b86c557

File tree

134 files changed

+5201
-1762
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+5201
-1762
lines changed

.devcontainer/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM ghcr.io/containerbase/devcontainer:13.8.5
1+
FROM ghcr.io/containerbase/devcontainer:13.8.8
22

33
# https://github.com/pnpm/pnpm/issues/8971
44
# renovate: datasource=npm
5-
RUN install-tool pnpm 10.6.1
5+
RUN install-tool pnpm 10.6.5

.github/actions/calculate-prefetch-matrix/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ runs:
3434
3535
- name: Check cache miss for MacOS
3636
id: macos-cache
37-
uses: actions/cache/restore@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
37+
uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
3838
with:
3939
path: node_modules
4040
key: ${{ env.MACOS_KEY }}
@@ -43,7 +43,7 @@ runs:
4343

4444
- name: Check cache miss for Windows
4545
id: windows-cache
46-
uses: actions/cache/restore@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
46+
uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
4747
with:
4848
path: node_modules
4949
key: ${{ env.WINDOWS_KEY }}

.github/actions/setup-node/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ runs:
3434
3535
- name: Restore `node_modules`
3636
id: node-modules-restore
37-
uses: actions/cache/restore@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
37+
uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
3838
with:
3939
path: node_modules
4040
key: ${{ env.CACHE_KEY }}
@@ -53,7 +53,7 @@ runs:
5353
standalone: true
5454

5555
- name: Setup Node
56-
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
56+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
5757
with:
5858
node-version: ${{ inputs.node-version }}
5959

@@ -64,7 +64,7 @@ runs:
6464
6565
- name: Cache and restore `pnpm store`
6666
if: env.CACHE_HIT != 'true'
67-
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
67+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
6868
with:
6969
path: ${{ env.PNPM_STORE }}
7070
key: |
@@ -87,7 +87,7 @@ runs:
8787

8888
- name: Write `node_modules` cache
8989
if: inputs.save-cache == 'true' && env.CACHE_HIT != 'true'
90-
uses: actions/cache/save@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
90+
uses: actions/cache/save@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
9191
with:
9292
path: node_modules
9393
key: ${{ env.CACHE_KEY }}

.github/label-actions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -632,10 +632,10 @@
632632
Hi there,
633633
634634
635-
You are seeing this message because someone - maybe you - has suggested that the documentation should be improved.
635+
Someone (maybe even you) suggested the documentation should be improved.
636636
637637
638-
The good news is that essentially all Renovate documentation is Open Source in this repository and can be improved by you too! If you have a suggestion for improvement, please consider opening a PR to improve the documentation, instead of just complaining about it (however subtlely or politely you intended it). Even if English isn't your first language or you're not _sure_ what to write, take a shot at it and we will guide you during the PR review. Documentation updates can be done easily in your browser on GitHub.com and do not require you to clone any code.
638+
Good news, nearly all Renovate documentation is Open Source. This means you can improve the docs yourself! Please consider opening a PR to improve our documentation, instead of complaining (however subtly or politely). Even if English isn't your first language, or you're not _sure_ what to write, please open a PR anyway. We will help you to finish the PR. You can make changes to our docs in your browser on GitHub.com. You don't need to clone any code with Git.
639639
640640
641641
Thanks, the Renovate

.github/workflows/build.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ jobs:
209209
os: ${{ runner.os }}
210210

211211
- name: Restore eslint cache
212-
uses: actions/cache/restore@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
212+
uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
213213
with:
214214
path: .cache/eslint
215215
key: eslint-cache
@@ -220,7 +220,7 @@ jobs:
220220

221221
- name: Save eslint cache
222222
if: github.event_name == 'push'
223-
uses: actions/cache/save@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
223+
uses: actions/cache/save@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
224224
with:
225225
path: .cache/eslint
226226
key: eslint-cache-${{ github.run_id }}-${{ github.run_attempt }}
@@ -244,7 +244,7 @@ jobs:
244244
os: ${{ runner.os }}
245245

246246
- name: Restore prettier cache
247-
uses: actions/cache/restore@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
247+
uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
248248
with:
249249
path: .cache/prettier
250250
key: prettier-cache
@@ -261,7 +261,7 @@ jobs:
261261
262262
- name: Save prettier cache
263263
if: github.event_name == 'push'
264-
uses: actions/cache/save@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
264+
uses: actions/cache/save@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
265265
with:
266266
path: .cache/prettier
267267
key: prettier-cache-${{ github.run_id }}-${{ github.run_attempt }}
@@ -357,7 +357,7 @@ jobs:
357357
os: ${{ runner.os }}
358358

359359
- name: Cache vitest
360-
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
360+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
361361
with:
362362
path: .cache/vitest
363363
key: |
@@ -394,7 +394,7 @@ jobs:
394394
395395
- name: Save coverage artifacts
396396
if: (success() || failure()) && github.event.pull_request.draft != true && matrix.coverage
397-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
397+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
398398
with:
399399
name: ${{ matrix.upload-artifact-name }}
400400
path: |
@@ -414,7 +414,7 @@ jobs:
414414
show-progress: false
415415

416416
- name: Download coverage reports
417-
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
417+
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
418418
with:
419419
pattern: coverage-*
420420
path: coverage
@@ -450,7 +450,7 @@ jobs:
450450
os: ${{ runner.os }}
451451

452452
- name: Download coverage reports
453-
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
453+
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
454454
with:
455455
pattern: coverage-*
456456
path: coverage
@@ -465,10 +465,10 @@ jobs:
465465
- name: Check coverage threshold
466466
run: |
467467
pnpm nyc check-coverage -t ./coverage/nyc \
468-
--branches 97.5 \
469-
--functions 98.98 \
470-
--lines 97.84 \
471-
--statements 97.84
468+
--branches 98.16 \
469+
--functions 99.51 \
470+
--lines 98.22 \
471+
--statements 98.22
472472
473473
# Catch-all required check for test matrix and coverage
474474
test-success:
@@ -542,7 +542,7 @@ jobs:
542542
run: pnpm build
543543

544544
- name: Upload dist
545-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
545+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
546546
with:
547547
name: renovate-dist
548548
path: dist/
@@ -560,7 +560,7 @@ jobs:
560560
show-progress: false
561561

562562
- name: Download dist
563-
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
563+
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
564564
with:
565565
name: renovate-dist
566566
path: dist/
@@ -605,7 +605,7 @@ jobs:
605605
os: ${{ runner.os }}
606606

607607
- name: Setup PDM
608-
uses: pdm-project/setup-pdm@b2472ca4258a9ea3aee813980a0100a2261a42fc # v4.2
608+
uses: pdm-project/setup-pdm@deb8d8a4e2a03aabcef6f2cc981923fc6b29ef99 # v4.3
609609
with:
610610
python-version-file: .python-version
611611
version: ${{ env.PDM_VERSION }}
@@ -624,7 +624,7 @@ jobs:
624624
run: pnpm test:docs
625625

626626
- name: Upload
627-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
627+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
628628
with:
629629
name: docs
630630
path: tmp/docs/
@@ -652,7 +652,7 @@ jobs:
652652
os: ${{ runner.os }}
653653

654654
- name: Download dist
655-
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
655+
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
656656
with:
657657
name: renovate-dist
658658
path: dist/
@@ -698,7 +698,7 @@ jobs:
698698
show-progress: false
699699

700700
- name: docker-config
701-
uses: containerbase/internal-tools@1a9a958e2982661f0baa123ce50aeba1a8726e3c # v3.10.8
701+
uses: containerbase/internal-tools@5f238c35cea9be15114787fd3eb32473160258f7 # v3.10.13
702702
with:
703703
command: docker-config
704704

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
4242
# Initializes the CodeQL tools for scanning.
4343
- name: Initialize CodeQL
44-
uses: github/codeql-action/init@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
44+
uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
4545
with:
4646
languages: javascript
4747

@@ -51,7 +51,7 @@ jobs:
5151
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5252
# If this step fails, then you should remove it and run the build manually (see below)
5353
- name: Autobuild
54-
uses: github/codeql-action/autobuild@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
54+
uses: github/codeql-action/autobuild@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
5555

5656
# ℹ️ Command-line programs to run using the OS shell.
5757
# 📚 https://git.io/JvXDl
@@ -65,4 +65,4 @@ jobs:
6565
# make release
6666

6767
- name: Perform CodeQL Analysis
68-
uses: github/codeql-action/analyze@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
68+
uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13

.github/workflows/scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ jobs:
4343
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
4444
# format to the repository Actions tab.
4545
- name: 'Upload artifact'
46-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
46+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
4747
with:
4848
name: SARIF file
4949
path: results.sarif
5050
retention-days: 5
5151

5252
# Upload the results to GitHub's code scanning dashboard.
5353
- name: 'Upload to code-scanning'
54-
uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
54+
uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
5555
with:
5656
sarif_file: results.sarif

.github/workflows/trivy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
format: 'sarif'
3232
output: 'trivy-results.sarif'
3333

34-
- uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
34+
- uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
3535
with:
3636
sarif_file: trivy-results.sarif
3737
category: 'docker-image-${{ matrix.tag }}'

.github/workflows/update-data.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
standalone: true
2828

2929
- name: Set up Node.js ${{ env.NODE_VERSION }}
30-
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
30+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
3131
with:
3232
node-version: ${{ env.NODE_VERSION }}
3333
cache: pnpm

docs/usage/configuration-options.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,14 @@ With the above config:
7979
- ESLint dependencies will have the label `linting`
8080
- All other dependencies will have the label `dependencies`
8181

82+
If you want to use dynamic labels, you can use [templates](./templates.md) such as this example using `depName` for `addLabels`:
83+
84+
```json
85+
{
86+
"addLabels": ["{{depName}}"]
87+
}
88+
```
89+
8290
<!-- prettier-ignore -->
8391
!!! note
8492
Keep your labels within the maximum character limit for your Git hosting platform.
@@ -3472,6 +3480,7 @@ Table with options:
34723480
| `gomodSkipVendor` | Never run `go mod vendor` after Go module updates. |
34733481
| `gomodVendor` | Always run `go mod vendor` after Go module updates even if vendor files aren't detected. |
34743482
| `helmUpdateSubChartArchives` | Update subchart archives in the `/charts` folder. |
3483+
| `kustomizeInflateHelmCharts` | Inflate updated helm charts referenced in the kustomization. |
34753484
| `npmDedupe` | Run `npm install` with `--prefer-dedupe` for npm >= 7 or `npm dedupe` after `package-lock.json` update for npm <= 6. |
34763485
| `pnpmDedupe` | Run `pnpm dedupe --config.ignore-scripts=true` after `pnpm-lock.yaml` updates. |
34773486
| `yarnDedupeFewer` | Run `yarn-deduplicate --strategy fewer` after `yarn.lock` updates. |

docs/usage/docker.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ Renovate will get the credentials with the [`google-auth-library`](https://www.n
307307
service_account: ${{ env.SERVICE_ACCOUNT }}
308308

309309
- name: renovate
310-
uses: renovatebot/[email protected].14
310+
uses: renovatebot/[email protected].17
311311
env:
312312
RENOVATE_HOST_RULES: |
313313
[
@@ -478,7 +478,7 @@ Make sure to install the Google Cloud SDK into the custom image, as you need the
478478
For example:
479479

480480
```Dockerfile
481-
FROM renovate/renovate:39.178.1
481+
FROM renovate/renovate:39.212.0
482482
# Include the "Docker tip" which you can find here https://cloud.google.com/sdk/docs/install
483483
# under "Installation" for "Debian/Ubuntu"
484484
RUN ...

docs/usage/examples/opentelemetry.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ services:
3636
otel-collector:
3737
# Using the Contrib version to access the spanmetrics connector.
3838
# If you don't need the spanmetrics connector, you can use the standard version
39-
image: otel/opentelemetry-collector-contrib:0.121.0
39+
image: otel/opentelemetry-collector-contrib:0.122.1
4040
volumes:
4141
- ./otel-collector-config.yml:/etc/otelcol-contrib/config.yaml
4242
ports:

docs/usage/examples/self-hosting.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ It builds `latest` based on the `main` branch and all SemVer tags are published
2525
```sh title="Example of valid tags"
2626
docker run --rm renovate/renovate
2727
docker run --rm renovate/renovate:39
28-
docker run --rm renovate/renovate:39.177
29-
docker run --rm renovate/renovate:39.178.1
28+
docker run --rm renovate/renovate:39.212
29+
docker run --rm renovate/renovate:39.212.0
3030
```
3131

3232
<!-- prettier-ignore -->
@@ -62,7 +62,7 @@ spec:
6262
- name: renovate
6363
# Update this to the latest available and then enable Renovate on
6464
# the manifest
65-
image: renovate/renovate:39.178.1
65+
image: renovate/renovate:39.212.0
6666
args:
6767
- user/repo
6868
# Environment Variables
@@ -121,7 +121,7 @@ spec:
121121
template:
122122
spec:
123123
containers:
124-
- image: renovate/renovate:39.178.1
124+
- image: renovate/renovate:39.212.0
125125
name: renovate-bot
126126
env: # For illustration purposes, please use secrets.
127127
- name: RENOVATE_PLATFORM
@@ -367,7 +367,7 @@ spec:
367367
containers:
368368
- name: renovate
369369
# Update this to the latest available and then enable Renovate on the manifest
370-
image: renovate/renovate:39.178.1
370+
image: renovate/renovate:39.212.0
371371
volumeMounts:
372372
- name: ssh-key-volume
373373
readOnly: true

docs/usage/self-hosted-configuration.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ This configuration option was previously named `allowPostUpgradeCommandTemplatin
6868
## allowedCommands
6969

7070
A list of regular expressions that decide which commands in `postUpgradeTasks` are allowed to run.
71+
72+
If you are using a template command, the regular expression should match the template itself, not the final resolved value.
7173
If this list is empty then no tasks will be executed.
7274

7375
For example:

lib/config/options/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ const options: RenovateOptions[] = [
516516
description:
517517
'Change this value to override the default Renovate sidecar image.',
518518
type: 'string',
519-
default: 'ghcr.io/containerbase/sidecar:13.8.5',
519+
default: 'ghcr.io/containerbase/sidecar:13.8.8',
520520
globalOnly: true,
521521
},
522522
{
@@ -2413,6 +2413,7 @@ const options: RenovateOptions[] = [
24132413
'gomodSkipVendor',
24142414
'gomodVendor',
24152415
'helmUpdateSubChartArchives',
2416+
'kustomizeInflateHelmArchives',
24162417
'npmDedupe',
24172418
'pnpmDedupe',
24182419
'yarnDedupeFewer',

0 commit comments

Comments
 (0)