Skip to content

Commit

Permalink
Merge branch 'main' into feat/gitlabci-to-use-schema
Browse files Browse the repository at this point in the history
  • Loading branch information
zharinov authored Jan 24, 2025
2 parents e11849a + cdc9662 commit 9bfb80a
Show file tree
Hide file tree
Showing 147 changed files with 1,652 additions and 1,048 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM ghcr.io/containerbase/devcontainer:13.6.0
FROM ghcr.io/containerbase/devcontainer:13.7.1
10 changes: 8 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,9 @@ jobs:
- name: Test schema
run: pnpm test-schema

- name: Lint other
run: pnpm lint-other

test:
needs: [setup, prefetch]

Expand Down Expand Up @@ -438,7 +441,7 @@ jobs:
merge-multiple: true

- name: Codecov
uses: codecov/codecov-action@5a605bd92782ce0810fa3b8acc235c921b497052 # v5.2.0
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
with:
token: ${{ secrets.CODECOV_TOKEN }}
directory: coverage/lcov
Expand Down Expand Up @@ -559,10 +562,13 @@ jobs:
run: pnpm build

- name: Build docker
run: pnpm build:docker build --tries=3
run: pnpm build:docker build --tries=3 --args '--load'
env:
LOG_LEVEL: debug

- name: Test docker
run: docker run -e LOG_LEVEL=debug --rm renovate/renovate --version

- name: Pack
run: pnpm test-e2e:pack

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@d68b2d4edb4189fd2a5366ac14e72027bd4b37dd # v3.28.2
uses: github/codeql-action/init@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
with:
languages: javascript

Expand All @@ -51,7 +51,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@d68b2d4edb4189fd2a5366ac14e72027bd4b37dd # v3.28.2
uses: github/codeql-action/autobuild@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5

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

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@d68b2d4edb4189fd2a5366ac14e72027bd4b37dd # v3.28.2
uses: github/codeql-action/analyze@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: 'Upload to code-scanning'
uses: github/codeql-action/upload-sarif@d68b2d4edb4189fd2a5366ac14e72027bd4b37dd # v3.28.2
uses: github/codeql-action/upload-sarif@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
format: 'sarif'
output: 'trivy-results.sarif'

- uses: github/codeql-action/upload-sarif@d68b2d4edb4189fd2a5366ac14e72027bd4b37dd # v3.28.2
- uses: github/codeql-action/upload-sarif@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
with:
sarif_file: trivy-results.sarif
category: 'docker-image-${{ matrix.tag }}'
1 change: 1 addition & 0 deletions docs/development/local-development.md
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ If you're only working on the documentation files, you can use the `pnpm doc-fix
## Documentation

We use [MkDocs](https://www.mkdocs.org) to generate the documentation.
To install the required dependency, use `pdm install`.
You can run `pnpm build:docs` to generate the docs.
Then use `pnpm mkdocs serve` to preview the documentation locally.
The docs will update automatically when you run `pnpm build:docs` again, no need to stop the `pnpm mkdocs serve` command.
Expand Down
4 changes: 2 additions & 2 deletions docs/usage/configuration-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -3374,7 +3374,7 @@ Table with options:
Post-upgrade tasks are commands that are executed by Renovate after a dependency has been updated but before the commit is created.
The intention is to run any other command line tools that would modify existing files or generate new files when a dependency changes.

Each command must match at least one of the patterns defined in `allowedPostUpgradeCommands` (a global-only configuration option) in order to be executed.
Each command must match at least one of the patterns defined in `allowedCommands` (a global-only configuration option) in order to be executed.
If the list of allowed tasks is empty then no tasks will be executed.

e.g.
Expand All @@ -3395,7 +3395,7 @@ The `postUpgradeTasks` configuration consists of three fields:

A list of commands that are executed after Renovate has updated a dependency but before the commit is made.

You can use variable templating in your commands as long as [`allowPostUpgradeCommandTemplating`](./self-hosted-configuration.md#allowpostupgradecommandtemplating) is enabled.
You can use variable templating in your commands as long as [`allowCommandTemplating`](./self-hosted-configuration.md#allowcommandtemplating) is enabled.

<!-- prettier-ignore -->
!!! note
Expand Down
46 changes: 25 additions & 21 deletions docs/usage/self-hosted-configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,13 @@ Please also see [Self-Hosted Experimental Options](./self-hosted-experimental.md
!!! note
Config options with `type=string` are always non-mergeable, so `mergeable=false`.

## allowCustomCrateRegistries

## allowPlugins

## allowPostUpgradeCommandTemplating
## allowCommandTemplating

Let's look at an example of configuring packages with existing Angular migrations.

```javascript
module.exports = {
allowedPostUpgradeCommands: ['^npm ci --ignore-scripts$', '^npx ng update'],
allowedCommands: ['^npm ci --ignore-scripts$', '^npx ng update'],
};
```

Expand Down Expand Up @@ -58,11 +54,32 @@ npm ci --ignore-scripts
npx ng update @angular/core --from=10.0.0 --to=11.0.0 --migrate-only --allow-dirty --force
```

If you wish to disable templating because of any security or performance concern, you may set `allowPostUpgradeCommandTemplating` to `false`.
But before you disable templating completely, try the `allowedPostUpgradeCommands` config option to limit what commands are allowed to run.
If you wish to disable templating because of any security or performance concern, you may set `allowCommandTemplating` to `false`.
But before you disable templating completely, try the `allowedCommands` config option to limit what commands are allowed to run.

This configuration option was previously named `allowPostUpgradeCommandTemplating`.

## allowCustomCrateRegistries

## allowPlugins

## allowScripts

## allowedCommands

A list of regular expressions that decide which commands in `postUpgradeTasks` are allowed to run.
If this list is empty then no tasks will be executed.

For example:

```json
{
"allowedCommands": ["^tslint --fix$", "^tslint --[a-z]+$"]
}
```

This configuration option was formerly known as `allowedPostUpgradeCommands`.

## allowedEnv

Bot administrators can allow users to configure custom environment variables within repo config.
Expand Down Expand Up @@ -129,19 +146,6 @@ module.exports = {
};
```

## allowedPostUpgradeCommands

A list of regular expressions that decide which commands in `postUpgradeTasks` are allowed to run.
If this list is empty then no tasks will be executed.

For example:

```json
{
"allowedPostUpgradeCommands": ["^tslint --fix$", "^tslint --[a-z]+$"]
}
```

## autodiscover

When you enable `autodiscover`, by default, Renovate runs on _every_ repository that the bot account can access.
Expand Down
Loading

0 comments on commit 9bfb80a

Please sign in to comment.