Skip to content

Commit

Permalink
Merge branch 'implement-custom-headers-2' of github.com:hiventive/ren…
Browse files Browse the repository at this point in the history
…ovate into implement-custom-headers-2
  • Loading branch information
hersentino committed Jan 15, 2024
2 parents 75d0010 + 96cdab4 commit 438d7e0
Show file tree
Hide file tree
Showing 198 changed files with 10,626 additions and 2,351 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:9.30.0
FROM ghcr.io/containerbase/devcontainer:9.31.3
2 changes: 1 addition & 1 deletion .github/actions/setup-node/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ runs:
run: corepack enable

- name: Setup Node
uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
with:
node-version: ${{ inputs.node-version }}
cache: ${{ env.CACHE_HIT != 'true' && 'pnpm' || '' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Setup Node.js
uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
with:
node-version: ${{ env.NODE_VERSION }}

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 @@ -39,7 +39,7 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9
uses: github/codeql-action/init@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
with:
languages: javascript

Expand All @@ -49,7 +49,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@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9
uses: github/codeql-action/autobuild@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0

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

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9
uses: github/codeql-action/analyze@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: 'Dependency Review'
uses: actions/dependency-review-action@01bc87099ba56df1e897b6874784491ea6309bc4 # v3.1.4
uses: actions/dependency-review-action@c74b580d73376b7750d3d2a50bfb8adc2c937507 # v3.1.5
2 changes: 1 addition & 1 deletion .github/workflows/devcontainer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Build and run dev container task
uses: devcontainers/ci@c3e31cc561800ac318ed000e22ffc6713c93d009 # v0.3.1900000338
uses: devcontainers/ci@3d462823359c481c587cb7426f39775f24257115 # v0.3.1900000339
with:
runCmd: pnpm build
2 changes: 1 addition & 1 deletion .github/workflows/release-npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
run: corepack enable

- name: Set up Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
with:
node-version: ${{ env.NODE_VERSION }}
cache: pnpm
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: 'Upload to code-scanning'
uses: github/codeql-action/upload-sarif@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9
uses: github/codeql-action/upload-sarif@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion .github/workflows/update-data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
run: corepack enable

- name: Set up Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
with:
node-version: ${{ env.NODE_VERSION }}
cache: pnpm
Expand Down
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[md]": {
"editor.wordBasedSuggestions": false
"editor.wordBasedSuggestions": "off"
},
"files.associations": {
"Dockerfile.*": "dockerfile",
Expand All @@ -21,6 +21,6 @@
"npm.packageManager": "pnpm",
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"source.fixAll.eslint": "explicit"
}
}
2 changes: 1 addition & 1 deletion data/debian-distro-info.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"series": "potato",
"created": "1999-03-09",
"release": "2000-08-15",
"eol": "2003-07-30"
"eol": "2003-06-30"
},
"v3": {
"codename": "Woody",
Expand Down
43 changes: 39 additions & 4 deletions data/kubernetes-api.json5
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,52 @@
// https://kubernetes.io/docs/reference/using-api/deprecation-guide/#v1-27
// https://kubernetes.io/docs/reference/using-api/deprecation-guide/#csistoragecapacity-v127
CSIStorageCapacity: ['storage.k8s.io/v1beta1', 'storage.k8s.io/v1'],
// https://github.com/fluxcd/flux2/releases/tag/v2.0.0

// https://fluxcd.io
Alert: [
'notification.toolkit.fluxcd.io/v1beta2',
'notification.toolkit.fluxcd.io/v1beta3',
],
Bucket: [
'source.toolkit.fluxcd.io/v1alpha1',
'source.toolkit.fluxcd.io/v1beta1',
'source.toolkit.fluxcd.io/v1beta2',
],
GitRepository: [
'source.toolkit.fluxcd.io/v1alpha1',
'source.toolkit.fluxcd.io/v1beta1',
'source.toolkit.fluxcd.io/v1beta2',
'source.toolkit.fluxcd.io/v1',
],
Kustomization: [
'kustomize.toolkit.fluxcd.io/v1beta2',
'kustomize.toolkit.fluxcd.io/v1',
HelmChart: [
'source.toolkit.fluxcd.io/v1alpha1',
'source.toolkit.fluxcd.io/v1beta1',
],
HelmRelease: [
'helm.toolkit.fluxcd.io/v2beta1',
'helm.toolkit.fluxcd.io/v2beta2',
],
HelmRepository: [
'source.toolkit.fluxcd.io/v1alpha1',
'source.toolkit.fluxcd.io/v1beta1',
'source.toolkit.fluxcd.io/v1beta2',
],
ImageRepository: ['image.toolkit.fluxcd.io/v1beta2'],
OCIRepository: ['source.toolkit.fluxcd.io/v1beta2'],
Provider: [
'notification.toolkit.fluxcd.io/v1beta2',
'notification.toolkit.fluxcd.io/v1beta3',
],
Receiver: [
'notification.toolkit.fluxcd.io/v1beta2',
'notification.toolkit.fluxcd.io/v1',
],

// https://fluxcd.io/flux/components/kustomize/kustomizations
// https://kubectl.docs.kubernetes.io/references/kustomize/kustomization
Kustomization: [
'kustomize.toolkit.fluxcd.io/v1beta2',
'kustomize.toolkit.fluxcd.io/v1',
'kustomize.config.k8s.io/v1beta1',
],
}
18 changes: 18 additions & 0 deletions docs/development/style-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,24 @@ Second sentence on a new line.
And so on.
```

## Avoid manually ordering numbered lists

Avoid:

```markdown
1. First item
2. Second item
3. Third item
```

Do:

```markdown
1. First item
1. Second item
1. Third item
```

## Avoid punctuation at the end of list items

In Markdown files, avoid punctuation at the end of a list item.
Expand Down
Binary file added docs/usage/assets/images/gerrit-http-password.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 5 additions & 6 deletions docs/usage/config-presets.md
Original file line number Diff line number Diff line change
Expand Up @@ -217,13 +217,12 @@ Create a [discussion](https://github.com/renovatebot/renovate/discussions) to pr
The maintainers can also help improve the preset, and let you know where to put it in the code.
If you are proposing a "monorepo" preset addition then it's OK to raise a PR directly as that can be more efficient than a GitHub Discussion.

## Organization level presets
## Group/Organization level presets

Whenever repository onboarding happens, Renovate checks if the current user/group/org has a default config to extend.
It looks for:

- A repository called `renovate-config` under the same user/group/org with a `default.json` file or
- A repository named like `.{{platform}}` (e.g. `.github`) under the same user/group/org with `renovate-config.json`
Whenever repository onboarding happens, Renovate checks for a a default config to extend.
Renovate will check for a repository called `renovate-config` with a `default.json` file in the parent user/group/org of the repository.
On platforms that support nested groups (e.g. GitLab), Renovate will check for this repository at each level of grouping, from nearest to furthest, and use the first one it finds.
On all platforms, it will then look for a repository named like `.{{platform}}` (e.g. `.github`) with a `renovate-config.json`, under the same top-level user/group/org.

If found, that repository's preset will be suggested as the sole extended preset, and any existing `onboardingConfig` config will be ignored/overridden.
For example the result may be:
Expand Down
55 changes: 52 additions & 3 deletions docs/usage/configuration-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -410,9 +410,21 @@ This is an advance field and it's recommend you seek a config review before appl

## bumpVersion

Currently this setting supports `helmv3`, `npm`, `nuget`, `maven` and `sbt` only, so raise a feature request if you have a use for it with other package managers.
Its purpose is if you want Renovate to update the `version` field within your package file any time it updates dependencies within.
Usually this is for automatic release purposes, so that you don't need to add another step after Renovate before you can release a new version.
Currently, this config option only works with these managers:

- `helmv3`
- `npm`
- `nuget`
- `maven`
- `ocb`
- `pep621`
- `poetry`
- `sbt`

Raise a feature request if you want to use this config option with other package managers.

Use `bumpVersion` if you want Renovate to update the `version` field in your package file when it updates the dependencies in that file.
This can be handy when you have automated your package's release, as you you don't need extra steps after the Renovate upgrade, you can just release a new version.

Configure this value to `"prerelease"`, `"patch"`, `"minor"` or `"major"` to have Renovate update the version in your edited package file.
e.g. if you wish Renovate to always increase the target `package.json` version with a patch update, configure this to `"patch"`.
Expand Down Expand Up @@ -1768,6 +1780,26 @@ Example config:
}
```

### maxRetryAfter

A remote host may return a `4xx` response with a `Retry-After` header value, which indicates that Renovate has been rate-limited.
Renovate may try to contact the host again after waiting a certain time, that's set by the host.
By default, Renovate tries again after the `Retry-After` header value has passed, up to a maximum of 60 seconds.
If the `Retry-After` value is more than 60 seconds, Renovate will abort the request instead of waiting.

You can configure a different maximum value in seconds using `maxRetryAfter`:

```json
{
"hostRules": [
{
"matchHost": "api.github.com",
"maxRetryAfter": 25
}
]
}
```

### dnsCache

Enable got [dnsCache](https://github.com/sindresorhus/got/blob/v11.5.2/readme.md#dnsCache) support.
Expand Down Expand Up @@ -3585,6 +3617,23 @@ Configure this to `true` if you wish to get one PR for every separate major vers
e.g. if you are on webpack@v1 currently then default behavior is a PR for upgrading to webpack@v3 and not for webpack@v2.
If this setting is true then you would get one PR for webpack@v2 and one for webpack@v3.

## statusCheckNames

You can customize the name/context of status checks that Renovate adds to commits/branches/PRs.

This option enables you to modify any existing status checks name/context, but adding new status checks this way is _not_ supported.
Setting the value to `null` or an empty string, effectively disables or skips that status check.
This option is mergeable, which means you only have to specify the status checks that you want to modify.

```json title="Example of overriding status check strings"
{
"statusCheckNames": {
"minimumReleaseAge": "custom/stability-days",
"mergeConfidence": "custom/merge-confidence-level"
}
}
```

## stopUpdatingLabel

This feature only works on supported platforms, check the table above.
Expand Down
2 changes: 1 addition & 1 deletion docs/usage/configuration-templates.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Be careful, and consider creating a new "config help" post at the [discussions t
Renovate uses one commit per branch.
The `commitMessage` reflects the contents of the branch and is usually the same as the PR title.

`commitMessage` has a default value of `{{commitMessagePrefix}} {{commitMessageAction}} {{commitMessageTopic}} {{commitMessageExtra}} {{commitMessageSuffix}}`, with the intention that you only edit some of those subcomponents.
`commitMessage` has a default value of `{{{commitMessagePrefix}}} {{{commitMessageAction}}} {{{commitMessageTopic}}} {{{commitMessageExtra}}} {{{commitMessageSuffix}}}`, with the intention that you only edit some of those subcomponents.

You usually don't need to edit `commitMessagePrefix`, this option is used by Renovate if it needs to add a prefix to conform to the Semantic Commit convention.
Avoid editing the commit message, unless you know what you're doing.
Expand Down
2 changes: 1 addition & 1 deletion docs/usage/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ To get access to the token a custom Renovate Docker image is needed that include
The Dockerfile to create such an image can look like this:
```Dockerfile
FROM renovate/renovate:37.83.4
FROM renovate/renovate:37.126.2
# Include the "Docker tip" which you can find here https://cloud.google.com/sdk/docs/install
# under "Installation" for "Debian/Ubuntu"
RUN ...
Expand Down
Loading

0 comments on commit 438d7e0

Please sign in to comment.