Skip to content

Commit 8df1517

Browse files
authored
Merge branch 'main' into feat-34427
2 parents b86c557 + 8a93407 commit 8df1517

File tree

174 files changed

+5603
-2822
lines changed

Some content is hidden

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

174 files changed

+5603
-2822
lines changed

.devcontainer/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM ghcr.io/containerbase/devcontainer:13.8.8
1+
FROM ghcr.io/containerbase/devcontainer:13.8.11
22

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

.github/label-actions.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
5. Fill out the information in your repository's `README.md`.
2121
6. Add the link to your reproduction to the first post of your Discussion. If you are not the original author, you can post a new comment with the link.
2222
23-
If you need help with running renovate on your minimal reproduction repository, please refer to our [Running Renovate guide](https://docs.renovatebot.com/getting-started/running/).
23+
If you need help with running Renovate on your minimal reproduction repository, please refer to our [Running Renovate guide](https://docs.renovatebot.com/getting-started/running/).
2424
2525
Good luck,
2626

.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ env:
3434
# are we on a release branch?
3535
DO_REALEASE: ${{ github.ref_name == github.event.repository.default_branch || github.ref_name == 'next' || startsWith(github.ref_name, 'maint/')}}
3636
NODE_VERSION: 22
37-
PDM_VERSION: 2.22.4 # renovate: datasource=pypi depName=pdm
37+
PDM_VERSION: 2.23.0 # renovate: datasource=pypi depName=pdm
3838
DRY_RUN: true
3939
TEST_LEGACY_DECRYPTION: true
4040
SPARSE_CHECKOUT: |-
@@ -698,7 +698,7 @@ jobs:
698698
show-progress: false
699699

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

.github/workflows/codeql-analysis.yml

+3-3
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@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
44+
uses: github/codeql-action/init@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
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@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
54+
uses: github/codeql-action/autobuild@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
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@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
68+
uses: github/codeql-action/analyze@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15

.github/workflows/dependency-review.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ jobs:
1414
show-progress: false
1515

1616
- name: 'Dependency Review'
17-
uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0
17+
uses: actions/dependency-review-action@ce3cf9537a52e8119d91fd484ab5b8a807627bf8 # v4.6.0

.github/workflows/scorecard.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ jobs:
5151

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

.github/workflows/trivy.yml

+1-1
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@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
34+
- uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
3535
with:
3636
sarif_file: trivy-results.sarif
3737
category: 'docker-image-${{ matrix.tag }}'

data/debian-distro-info.json

+5
Original file line numberDiff line numberDiff line change
@@ -140,5 +140,10 @@
140140
"codename": "Forky",
141141
"series": "forky",
142142
"created": "2025-08-01"
143+
},
144+
"v15": {
145+
"codename": "Duke",
146+
"series": "duke",
147+
"created": "2027-08-01"
143148
}
144149
}

docs/development/docs-site.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Docs site
2+
3+
The [Renovate docs site](https://docs.renovatebot.com) is built from [a dedicated publishing repository](https://github.com/renovatebot/renovatebot.github.io) that pulls the source files from [this repository](../usage/).
4+
5+
The publishing process is triggered automatically via Renovate updates.
6+
If you have submitted a documentation PR and your changes are not published within a day feel free to ping the maintainers.

docs/usage/configuration-options.md

+12
Original file line numberDiff line numberDiff line change
@@ -2339,6 +2339,7 @@ Supported lock files:
23392339
- `requirements.txt`
23402340
- `uv.lock`
23412341
- `yarn.lock`
2342+
- `pixi.lock`
23422343

23432344
Support for new lock files may be added via feature request.
23442345

@@ -2456,6 +2457,17 @@ In those cases a feature request needs to be implemented.
24562457
!!! warning "Warning for Maven users"
24572458
For `minimumReleaseAge` to work, the Maven source must return reliable `last-modified` headers.
24582459

2460+
<!-- markdownlint-disable MD046 -->
2461+
If your custom Maven source registry is **pull-through** and does _not_ support the `last-modified` header, like GAR (Google Artifact Registry's Maven implementation) then you can extend the Maven source registry URL with `https://repo1.maven.org/maven2` as the first item. Then the `currentVersionTimestamp` via `last-modified` will be taken from Maven central for public dependencies.
2462+
2463+
```json
2464+
"registryUrls": [
2465+
"https://repo1.maven.org/maven2",
2466+
"https://europe-maven.pkg.dev/org-artifacts/maven-virtual"
2467+
],
2468+
```
2469+
<!-- markdownlint-enable MD046 -->
2470+
24592471
<!-- prettier-ignore -->
24602472
!!! note
24612473
Configuring this option will add a `renovate/stability-days` option to the status checks.

docs/usage/docker.md

+2-2
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].17
310+
uses: renovatebot/[email protected].18
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.212.0
481+
FROM renovate/renovate:39.233.5
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ name: renovate-otel-demo
1414
services:
1515
# Jaeger for storing traces
1616
jaeger:
17-
image: jaegertracing/jaeger:2.4.0
17+
image: jaegertracing/jaeger:2.5.0
1818
ports:
1919
- '16686:16686' # Web UI
2020
- '4317' # OTLP gRPC

docs/usage/examples/self-hosting.md

+5-5
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.212
29-
docker run --rm renovate/renovate:39.212.0
28+
docker run --rm renovate/renovate:39.233
29+
docker run --rm renovate/renovate:39.233.5
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.212.0
65+
image: renovate/renovate:39.233.5
6666
args:
6767
- user/repo
6868
# Environment Variables
@@ -121,7 +121,7 @@ spec:
121121
template:
122122
spec:
123123
containers:
124-
- image: renovate/renovate:39.212.0
124+
- image: renovate/renovate:39.233.5
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.212.0
370+
image: renovate/renovate:39.233.5
371371
volumeMounts:
372372
- name: ssh-key-volume
373373
readOnly: true

docs/usage/upgrade-best-practices.md

+12-7
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@
22

33
This page explains what we (the Renovate maintainers) recommend you do to update your dependencies.
44

5-
We'll cover starting a new project, updating a year-old project, and updating a project with five year old dependencies.
6-
We explain why you should update often, and how to nudge your team to update their dependencies.
7-
85
## General recommendations
96

107
In general, you should:
118

129
- Run Renovate on _every_ repository
13-
- Use the `config:best-practices` preset instead of `config:recommended`
10+
- Use the `config:best-practices` preset, instead of the `config:recommended` preset
1411
- Use the Dependency Dashboard issue (it's on by default)
1512
- Update your dependencies often
1613
- Read the changelogs for the updates
@@ -45,17 +42,17 @@ The [`config:best-practices` preset](./presets-config.md#configbest-practices) h
4542

4643
```json
4744
{
48-
"configMigration": true,
4945
"extends": [
5046
"config:recommended",
5147
"docker:pinDigests",
5248
"helpers:pinGitHubActionDigests",
49+
":configMigration",
5350
":pinDevDependencies"
5451
]
5552
}
5653
```
5754

58-
The next sections explain each part of the preset.
55+
The next sections explain what each part of the preset does.
5956

6057
#### Config migration
6158

@@ -127,6 +124,14 @@ Finally, when you're updating often, you'll start looking for ways to automate t
127124
You may start to [`automerge`](./configuration-options.md#automerge) development dependencies like Prettier, or ESLint when the linter passes.
128125
Or you may decide to automerge any `patch` type upgrades, by using the [`default:automergePatch`](./presets-default.md#automergepatch) preset.
129126

127+
#### Wait two weeks before automerging third-party dependencies
128+
129+
If you `automerge` third-party dependencies, we recommend setting [`minimumReleaseAge`](./configuration-options.md#minimumreleaseage) to `"14 days"`.
130+
By waiting two weeks before automerging the dependencies, you give the upstream registries time to pull malicious dependencies, before Renovate merges them.
131+
If you want a third-party dependency update _now_, instead of waiting two weeks, you can request the update from the Dependency Dashboard.
132+
133+
#### Use GitHub Pull Request Merge Queues
134+
130135
You may also start using [GitHub's pull request merge queues](./key-concepts/automerge.md#github-merge-queue) to speed up the merge process.
131136
Renovate does not support GitLab's Merge Trains, see [issue #5573](https://github.com/renovatebot/renovate/issues/5573).
132137

@@ -276,5 +281,5 @@ Martin Fowler has two great resources:
276281
- The free page [Patterns for Managing Source Code Branches](https://martinfowler.com/articles/branching-patterns.html) to help you decide what Git branch pattern to use
277282
- The book [Refactoring, Improving the Design of Existing Code](https://martinfowler.com/books/refactoring.html) to help your developers gradually refactor to clean, modular and easy to read code
278283

279-
The `git bisect` command can help you find out which commit introduced a bug, or other behavior change.
284+
The `git bisect` command can help you find the commit that introduced a bug, or other behavior change.
280285
Read the [ProGit 2 book, section on binary search](https://git-scm.com/book/en/v2/Git-Tools-Debugging-with-Git#_binary_search) to learn more.

eslint.config.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export default tseslint.config(
4444
eslintContainerbase.configs.all,
4545
{
4646
linterOptions: {
47-
reportUnusedDisableDirectives: true,
47+
reportUnusedDisableDirectives: 'error',
4848
},
4949

5050
languageOptions: {

lib/config/options/index.ts

+2-2
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.8',
519+
default: 'ghcr.io/containerbase/sidecar:13.8.11',
520520
globalOnly: true,
521521
},
522522
{
@@ -2413,7 +2413,7 @@ const options: RenovateOptions[] = [
24132413
'gomodSkipVendor',
24142414
'gomodVendor',
24152415
'helmUpdateSubChartArchives',
2416-
'kustomizeInflateHelmArchives',
2416+
'kustomizeInflateHelmCharts',
24172417
'npmDedupe',
24182418
'pnpmDedupe',
24192419
'yarnDedupeFewer',

lib/config/presets/common.ts

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ export const removedPresets: Record<string, string | null> = {
3131
'github>whitesource/merge-confidence:beta': 'mergeConfidence:all-badges',
3232
'replacements:messageFormat-{{package}}-to-@messageformat/{{package}}':
3333
'replacements:messageFormat-to-scoped',
34+
'regexManagers:azurePipelinesVersions':
35+
'customManagers:azurePipelinesVersions',
3436
'regexManagers:biomeVersions': 'customManagers:biomeVersions',
3537
'regexManagers:bitbucketPipelinesVersions':
3638
'customManagers:bitbucketPipelinesVersions',

lib/config/presets/index.spec.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { PLATFORM_RATE_LIMIT_EXCEEDED } from '../../constants/error-messages';
33
import { ExternalHostError } from '../../types/errors/external-host-error';
44
import * as memCache from '../../util/cache/memory';
55
import * as _packageCache from '../../util/cache/package';
6+
import { setCustomEnv } from '../../util/env';
67
import { GlobalConfig } from '../global';
78
import type { RenovateConfig } from '../types';
89
import * as _github from './github';
@@ -331,7 +332,7 @@ describe('config/presets/index', () => {
331332
});
332333

333334
it('resolves self-hosted preset with templating', async () => {
334-
GlobalConfig.set({ customEnvVariables: { GIT_REF: 'abc123' } });
335+
setCustomEnv({ GIT_REF: 'abc123' });
335336
config.extends = ['local>username/preset-repo#{{ env.GIT_REF }}'];
336337
local.getPreset.mockImplementationOnce(({ tag }) =>
337338
tag === 'abc123'

0 commit comments

Comments
 (0)