Skip to content

Commit

Permalink
Merge branch 'main' into feat/pip-compile/uv-pip-compile
Browse files Browse the repository at this point in the history
  • Loading branch information
rarkins authored Feb 3, 2025
2 parents f591b83 + 2283f2c commit 699f283
Show file tree
Hide file tree
Showing 67 changed files with 3,006 additions and 782 deletions.
6 changes: 5 additions & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
FROM ghcr.io/containerbase/devcontainer:13.7.2
FROM ghcr.io/containerbase/devcontainer:13.7.5

# https://github.com/pnpm/pnpm/issues/8971
# renovate: datasource=npm
RUN install-tool pnpm 9.15.4
2 changes: 1 addition & 1 deletion .devcontainer/post-create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ if [[ "${CODESPACES}" == true ]]; then
sudo chmod 1777 /tmp
fi

COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm install
pnpm install --reporter append-only --aggregate-output
53 changes: 42 additions & 11 deletions .github/label-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,16 +100,6 @@
</details>
### Insufficient logs
<details><summary>Select me to read instructions</summary>
If you already gave us a log, and the Renovate team said it's not enough, then follow the instructions from the **No logs at all** section.
</details>
### Formatting your logs
<details><summary>Select me to read instructions</summary>
Expand Down Expand Up @@ -137,12 +127,31 @@
The Renovate team
'auto:logs-insufficient':
comment: >
Hi there,
The logs you provided are insufficient to help you.
Please provide more logs, or more detailed logs, so we can help you. Be sure to include _DEBUG_ logs, and don't excessively redact or truncate them.
If you feel the logs are too large to paste here, please use a service like [GitHub Gist](https://gist.github.com/) and paste the link here.
Read the [Renovate docs, Troubleshooting](https://docs.renovatebot.com/troubleshooting/) to learn more about getting the correct logs.
Thanks, the Renovate team
'auto:logs-packages':
comment: >
Hi there,
A maintainer wants you to find and share a specific log message (`packageFiles with updates`) from your repository or environment.
Please locate the debug message `packageFiles with updates` in your logs and paste the contents here. Depending on your question, we may need the full list of packages or only one.
If you self-host Renovate: make sure you run Renovate with `LOG_LEVEL=debug` to get the debug log messages! Next, open the debug-level logs and search for `packageFiles with updates`. This text marks the start of a structured log message that shows every package file, dependency, and update that Renovate found.
Expand Down Expand Up @@ -531,3 +540,25 @@
Thanks, the Renovate team
'auto:inactive-pr':
comment: >
Hi there,
This PR appears to have been inactive for a while. Please let us know if you are still working on it, or if we can close it for now.
Thanks, the Renovate team
'auto:close-inactive-pr':
comment: >
Hi there,
We're closing this PR due to inactivity, but we are happy for you, or others, to finish the PR if time allows.
Thanks, the Renovate team
close: true
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ jobs:
show-progress: false

- name: docker-config
uses: containerbase/internal-tools@1d0c5b3aabe4a10a264d309f65ecbbd83d0e672e # v3.5.21
uses: containerbase/internal-tools@bbbf98bb61968071a4052c89fccd25a292d69c73 # v3.5.22
with:
command: docker-config

Expand Down
8 changes: 4 additions & 4 deletions docs/development/local-development.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ You need the following dependencies for local development:

- Git `>=2.45.1`
- Node.js `^20.15.1`
- pnpm `^9.0.0` (use corepack)
- pnpm `^9.0.0`
- C++ compiler

We recommend you use the version of Node.js defined in the repository's `.nvmrc` or use [Volta](https://volta.sh/) to manage your tool versions.
Expand All @@ -26,12 +26,12 @@ You can use the following commands on Ubuntu.
curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash -
sudo apt-get update
sudo apt-get install -y git build-essential nodejs
corepack enable
npm install -g pnpm@latest-10
```

#### Nix

To enter a development shell with the necessary packages, run `nix-shell --packages gcc gitFull nodejs` and then `corepack enable`.
To enter a development shell with the necessary packages, run `nix-shell --packages gcc gitFull nodejs` and then `npm install -global pnpm@latest-10`.

#### Windows

Expand All @@ -41,7 +41,7 @@ If you already installed a part, skip the corresponding step.
- Install [Git](https://git-scm.com/downloads). Make sure you've [configured your username and email](https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup)
- Install [Node.js LTS](https://nodejs.org/en/download/)
- In an Administrator PowerShell prompt, run `npm install -global npm` and then `npm --debug install --global windows-build-tools`
- Enable corepack with: `corepack enable`
- Install pnpm with: `npm install -global pnpm@latest-10`

You can see what versions you're using like this:

Expand Down
22 changes: 19 additions & 3 deletions docs/usage/configuration-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ The `matchStrings` must capture/extract the following three fields:
- `depName` and / or `packageName`
- `currentValue`

Alteratively, you could also use corresponding templates (e.g. `depNameTemplate`) for these fields.
Alternatively, you could also use corresponding templates (e.g. `depNameTemplate`) for these fields.
But, we recommend you use only _one_ of these methods, or you'll get confused.

Also, we recommend you explicitly set which `versioning` Renovate should use.
Expand Down Expand Up @@ -849,7 +849,8 @@ It will be compiled using Handlebars and the regex `groups` result.
It specifies the syntax of the package file that's managed by the custom `jsonata` manager.
This setting helps the system correctly parse and interpret the configuration file's contents.

Only the `json` format is supported.
Only the `json` and `yaml` formats are supported.
`yaml` files are parsed as multi document YAML files.

```json title="Parsing a JSON file with a custom manager"
{
Expand All @@ -866,6 +867,21 @@ Only the `json` format is supported.
}
```

```json title="Parsing a YAML file with a custom manager"
{
"customManagers": [
{
"customType": "jsonata",
"fileFormat": "yaml",
"fileMatch": ["file.yml"],
"matchStrings": [
"packages.{ \"depName\": package, \"currentValue\": version }"
]
}
]
}
```

### matchStrings

Each `matchStrings` must be one of the following:
Expand Down Expand Up @@ -2471,7 +2487,7 @@ When in `silent` mode Renovate will:

- _not_ create or update any Issue: even the Dependency Dashboard or Config Warning Issues will stay as-is
- _not_ prune or close any existing Issues
- _not_ create any Config Migration PRs, even if you explictly enabled Config Migration PRs in your Renovate config
- _not_ create any Config Migration PRs, even if you explicitly enabled Config Migration PRs in your Renovate config

## npmToken

Expand Down
6 changes: 3 additions & 3 deletions docs/usage/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ Renovate will get the credentials with the [`google-auth-library`](https://www.n
```yaml title="Example for Workload Identity plus Renovate host rules"
- name: authenticate to google cloud
id: auth
uses: google-github-actions/[email protected].7
uses: google-github-actions/[email protected].8
with:
token_format: 'access_token'
workload_identity_provider: ${{ env.WORKLOAD_IDENTITY_PROVIDER }}
Expand Down Expand Up @@ -478,7 +478,7 @@ Make sure to install the Google Cloud SDK into the custom image, as you need the
For example:

```Dockerfile
FROM renovate/renovate:39.134.0
FROM renovate/renovate:39.156.2
# Include the "Docker tip" which you can find here https://cloud.google.com/sdk/docs/install
# under "Installation" for "Debian/Ubuntu"
RUN ...
Expand All @@ -501,7 +501,7 @@ hostRules: [
One way to give Renovate the short-lived Google Access Token is to:

1. Write a script that generates a `config.js` file, with the token, in your `gitlab-ci.yml` file
1. Run the `config.js` creation scrip just before you start Renovate
1. Run the `config.js` creation script just before you start Renovate

For example:

Expand Down
10 changes: 5 additions & 5 deletions docs/usage/examples/self-hosting.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ It builds `latest` based on the `main` branch and all SemVer tags are published
```sh title="Example of valid tags"
docker run --rm renovate/renovate
docker run --rm renovate/renovate:39
docker run --rm renovate/renovate:39.134
docker run --rm renovate/renovate:39.134.0
docker run --rm renovate/renovate:39.156
docker run --rm renovate/renovate:39.156.2
```

<!-- prettier-ignore -->
Expand Down Expand Up @@ -62,7 +62,7 @@ spec:
- name: renovate
# Update this to the latest available and then enable Renovate on
# the manifest
image: renovate/renovate:39.134.0
image: renovate/renovate:39.156.2
args:
- user/repo
# Environment Variables
Expand Down Expand Up @@ -121,7 +121,7 @@ spec:
template:
spec:
containers:
- image: renovate/renovate:39.134.0
- image: renovate/renovate:39.156.2
name: renovate-bot
env: # For illustration purposes, please use secrets.
- name: RENOVATE_PLATFORM
Expand Down Expand Up @@ -367,7 +367,7 @@ spec:
containers:
- name: renovate
# Update this to the latest available and then enable Renovate on the manifest
image: renovate/renovate:39.134.0
image: renovate/renovate:39.156.2
volumeMounts:
- name: ssh-key-volume
readOnly: true
Expand Down
2 changes: 1 addition & 1 deletion docs/usage/getting-started/installing-onboarding.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Read the [Security and Permissions](../security-and-permissions.md) page to learn more about:

- Renovate's security stance
- What do if you need to use certificed software
- What do if you need to use certified software
- The security/disclosure process
- Permissions
- Privacy
Expand Down
2 changes: 1 addition & 1 deletion docs/usage/language-constraints-and-upgrading.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ In short, users who set `constraintsFiltering=strict` often do not understand ho

## Transitive constraint limitations

Often a library sets language constraints (like the `engines` examples above), and then depend on libraries with _narrower_ contraints, like `"node": "^20.0.0"`.
Often a library sets language constraints (like the `engines` examples above), and then depend on libraries with _narrower_ constraints, like `"node": "^20.0.0"`.
In cases like these, Renovate "trusts" the declaration of the library and may create a update, even _with_ strict constraints filtering.

For some package managers, like `npm`, this incompatibility will _not_ be detected or warned about (even during lock file generation), but this may not be a problem for your application.
Expand Down
2 changes: 1 addition & 1 deletion docs/usage/python.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Legacy versions with the `===` prefix are ignored.
## Package name matching

Your `matchPackageName` or `matchPackagePattern` rules will be matching against normalized names.
So if you have specified package `some.package` or `ANOTHER_DEP` in your package files (`requirements.txt`, `pyproject.toml`), they will be treated as `some-package` and `another-dep` respecitvely.
So if you have specified package `some.package` or `ANOTHER_DEP` in your package files (`requirements.txt`, `pyproject.toml`), they will be treated as `some-package` and `another-dep` respectively.
Not only they will be case insensitive but will replace any amount `._-` to a single `-`.
[Consult Python packaging documentation for the specification](https://packaging.python.org/en/latest/specifications/name-normalization/).

Expand Down
2 changes: 1 addition & 1 deletion docs/usage/release-notes-for-major-versions.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Read the [GitHub Docs, Signature verification for rebase and merge](https://docs

#### Why we change branch names with multiple slashes

Branches with mutiple slashes (`/`) are not wanted, this was a bug.
Branches with multiple slashes (`/`) are not wanted, this was a bug.
We are changing it in a major release out of politeness to all our users.
If you enabled `branchNameStrict`, you can expect some branch names to change.

Expand Down
9 changes: 9 additions & 0 deletions docs/usage/self-hosted-experimental.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,15 @@ The formula for the delay between attempts is `RENOVATE_X_GITLAB_MERGE_REQUEST_D

Default value: `5` (attempts results in max. 13.75 seconds timeout).

## `RENOVATE_X_GITLAB_BRANCH_STATUS_CHECK_ATTEMPTS`

If set to a positive integer, Renovate will use this as the number of attempts to check branch status before trying to add a status check.
The delay between attempts is `RENOVATE_X_GITLAB_BRANCH_STATUS_DELAY` milliseconds.

Default value: `2` (attempts results in maximum 2 seconds timeout).

!!! warning Increasing this value too much penalizes projects that do not have defined pipelines, Renovate will systematically wait `RENOVATE_X_GITLAB_BRANCH_STATUS_CHECK_ATTEMPTS * RENOVATE_X_GITLAB_BRANCH_STATUS_DELAY` milliseconds on these projects and slow down the Renovate analyzes.

## `RENOVATE_X_GITLAB_BRANCH_STATUS_DELAY`

Adjust default time (in milliseconds) given to GitLab to create pipelines for a commit pushed by Renovate.
Expand Down
4 changes: 2 additions & 2 deletions docs/usage/string-pattern-matching.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ It is not valid to combine `*` with any other positive or negative match.
}
```

In the latter case, the `*` can be ommitted and achieve the same thing.
In the latter case, the `*` can be omitted and achieve the same thing.

## Regex matching

Expand All @@ -47,7 +47,7 @@ To ignore case sensitivity you must set the `i` flag, see the regex patterns tab
### Renovate uses re2 syntax

Renovate uses the [`re2` library](https://github.com/google/re2) for regex matching.
`re2` is different from the full regex specification, because `re2` has a different sytax/support.
`re2` is different from the full regex specification, because `re2` has a different syntax/support.

For the full `re2` syntax, read [the `re2` syntax wiki page](https://github.com/google/re2/wiki/Syntax).

Expand Down
2 changes: 1 addition & 1 deletion docs/usage/templates.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ Splits a string into an array of substrings.

This example splits a package name by `-` and gets the second part:
`{{ lookup (split packageName '-') 1 }}`
An input of `foo-bar-test` therefor would return `bar`.
An input of `foo-bar-test` therefore would return `bar`.

### stringToPrettyJSON

Expand Down
2 changes: 1 addition & 1 deletion lib/config/options/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2745,7 +2745,7 @@ const options: RenovateOptions[] = [
description:
'It specifies the syntax of the package file being managed by the custom JSONata manager.',
type: 'string',
allowedValues: ['json'],
allowedValues: ['json', 'yaml'],
parents: ['customManagers'],
cli: false,
env: false,
Expand Down
2 changes: 1 addition & 1 deletion lib/config/presets/internal/global.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { Preset } from '../types';

export const presets: Record<string, Preset> = {
safeEnv: {
allowedEnv: ['GO*', 'RUSTC_BOOTSTRAP'],
allowedEnv: ['GO*', 'GRADLE_OPTS', 'RUSTC_BOOTSTRAP'],
description:
'Hopefully safe environment variables to allow users to configure.',
},
Expand Down
3 changes: 3 additions & 0 deletions lib/data/monorepo.json
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,7 @@
"kotlin": "https://github.com/JetBrains/kotlin",
"kotlinx-coroutines": "https://github.com/Kotlin/kotlinx.coroutines",
"kroki": "https://github.com/yuzutech/kroki",
"ksp": "https://github.com/google/ksp",
"ktor": "https://github.com/ktorio/ktor",
"lamar": "https://github.com/JasperFx/lamar",
"lerna": "https://github.com/lerna/lerna",
Expand Down Expand Up @@ -462,6 +463,7 @@
"orleans": "https://github.com/dotnet/orleans",
"panda-css": "https://github.com/chakra-ui/panda",
"parcel": "https://github.com/parcel-bundler/parcel",
"payloadcms": "https://github.com/payloadcms/payload",
"percy-cli": "https://github.com/percy/cli",
"picassojs": "https://github.com/qlik-oss/picasso.js",
"pixijs": [
Expand Down Expand Up @@ -493,6 +495,7 @@
"https://github.com/ReactTraining/react-router",
"https://github.com/remix-run/react-router"
],
"react-spectrum": "https://github.com/adobe/react-spectrum",
"reactivestack-cookies": "https://github.com/reactivestack/cookies",
"reakit": "https://github.com/reakit/reakit",
"redwood": "https://github.com/redwoodjs/redwood",
Expand Down
Loading

0 comments on commit 699f283

Please sign in to comment.