Skip to content

Commit

Permalink
Merge branch 'main' into fix/host-rules-migration
Browse files Browse the repository at this point in the history
  • Loading branch information
RahulGautamSingh committed Apr 26, 2023
2 parents 588fda1 + dc1d1e8 commit 056a77d
Show file tree
Hide file tree
Showing 193 changed files with 6,738 additions and 3,311 deletions.
7 changes: 6 additions & 1 deletion .devcontainer/Dockerfile
@@ -1,6 +1,11 @@
FROM ghcr.io/containerbase/node:18.15.0@sha256:d7bd3e320e60dfd51a5b4ddbb01929f18d8c54b00c6f9d706e6dcfbc17dfee1e
FROM ghcr.io/containerbase/node:18.16.0

USER root

RUN install-apt make g++

# renovate: datasource=github-releases packageName=containerbase/python-prebuild
RUN install-tool python 3.11.3

# renovate: datasource=npm
RUN install-tool yarn 1.22.19
27 changes: 17 additions & 10 deletions .devcontainer/devcontainer.json
@@ -1,21 +1,28 @@
{
"$schema": "https://raw.githubusercontent.com/devcontainers/spec/main/schemas/devContainer.schema.json",
"hostRequirements": {
"cpus": 4,
"memory": "8gb",
"memory": "7gb",
"storage": "32gb"
},
"name": "Renovate",
"dockerFile": "Dockerfile",
"settings": {
"terminal.integrated.profiles.linux": { "bash": { "path": "/bin/bash" } },
"terminal.integrated.defaultProfile.linux": "bash"
"customizations": {
"vscode": {
"settings": {
"terminal.integrated.profiles.linux": {
"bash": { "path": "/bin/bash" }
},
"terminal.integrated.defaultProfile.linux": "bash"
},
"extensions": [
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"orta.vscode-jest",
"EditorConfig.editorconfig"
]
}
},
"extensions": [
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"orta.vscode-jest",
"EditorConfig.editorconfig"
],
"runArgs": [
"--cap-add=SYS_PTRACE",
"--security-opt",
Expand Down
2 changes: 1 addition & 1 deletion .eslintrc.js
Expand Up @@ -137,7 +137,7 @@ module.exports = {
},
],

'@typescript-eslint/unbound-method': 2,
'@typescript-eslint/unbound-method': [2, { ignoreStatic: true }],
'@typescript-eslint/ban-types': 2,
'@renovate/jest-root-describe': 2,

Expand Down
16 changes: 11 additions & 5 deletions .github/contributing.md
Expand Up @@ -14,7 +14,12 @@ If you want help with your Renovate configuration, go to the [discussions tab in

## Bug Reports and Feature Requests

If you've found a **bug** or have a **feature request** then please create an issue in this repository (but search first in case a similar issue already exists).
**Bugs**: First search for related bugs in the issues and discussions, if you don't find anything then:

1. Create a [minimal reproduction](https://github.com/renovatebot/renovate/blob/main/docs/development/minimal-reproductions.md)
1. Open a new _discussion_ and link to the minimal reproduction

For **feature requests**: first search for related requests in the issues and discussions, if you don't find anything: create a _discussion_.

## Code

Expand All @@ -35,12 +40,13 @@ This makes it harder for us to review your work because we don't know what has c
PRs will always be squashed by us when we merge your work.
Commit as many times as you need in your pull request branch.

If you are updating your PR branch from within the GitHub PR interface, then only use the default "Update branch" button.
If you're updating your PR branch from within the GitHub PR interface, use the default "Update branch" button.
This is the "Update with merge commit" option in the dropdown.

Force pushing a PR is OK when:
Force pushing a PR, or using the "Update with rebase" button is OK when you:

- you need to make large changes on a PR which require a full review anyway
- you need to bring the branch up-to-date with the target branch and incorporating the changes is more work than to create a new PR
- make large changes on a PR which require a full review anyway
- bring the branch up-to-date with the target branch and incorporating the changes is more work than to create a new PR

## Apply maintainer provided review suggestions

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Expand Up @@ -55,7 +55,7 @@ jobs:
NODE_VERSION: ${{ matrix.node-version }}

steps:
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
with:
fetch-depth: 2

Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
run: yarn jest --ci --coverage ${{ env.coverage }}

- name: Codecov
uses: codecov/codecov-action@40a12dcee2df644d47232dde008099a3e9e4f865 # v3.1.2
uses: codecov/codecov-action@894ff025c7b54547a9a2a1e9f228beae737ad3c2 # v3.1.3
if: always() && env.coverage == 'true'

- name: E2E Test
Expand All @@ -106,7 +106,7 @@ jobs:
timeout-minutes: 15

steps:
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
with:
fetch-depth: 2

Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:

steps:
# full checkout for semantic-release
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
with:
fetch-depth: 0

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Expand Up @@ -22,15 +22,15 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2

- name: Delete fixtures to suppress false positives
run: |
find ./lib -type d -name '__fixtures__' -exec rm -rf {} \; || true
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@d186a2a36cc67bfa1b860e6170d37fb9634742c7 # v2.2.11
uses: github/codeql-action/init@b2c19fb9a2a485599ccf4ed5d65527d94bc57226 # v2.3.0
with:
languages: javascript

Expand All @@ -40,7 +40,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@d186a2a36cc67bfa1b860e6170d37fb9634742c7 # v2.2.11
uses: github/codeql-action/autobuild@b2c19fb9a2a485599ccf4ed5d65527d94bc57226 # v2.3.0

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

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@d186a2a36cc67bfa1b860e6170d37fb9634742c7 # v2.2.11
uses: github/codeql-action/analyze@b2c19fb9a2a485599ccf4ed5d65527d94bc57226 # v2.3.0
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 'Checkout Repository'
uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2

- name: 'Dependency Review'
uses: actions/dependency-review-action@f46c48ed6d4f1227fb2d9ea62bf6bcbed315589e # v3.0.4
17 changes: 17 additions & 0 deletions .github/workflows/devcontainer.yml
@@ -0,0 +1,17 @@
name: devcontainer
on:
pull_request:
branches:
- main

jobs:
devcontainer-test:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2

- name: Build and run dev container task
uses: devcontainers/ci@57eaf0c9b518a76872bc429cdceefd65a912309b # v0.3.1900000329
with:
runCmd: yarn build
3 changes: 2 additions & 1 deletion .github/workflows/release-npm.yml
Expand Up @@ -25,6 +25,7 @@ env:

permissions:
contents: read
id-token: write

jobs:
release-npm:
Expand All @@ -38,7 +39,7 @@ jobs:
echo "NPM_TAG=${{ github.event.inputs.tag }}" >> $GITHUB_ENV
fi
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
with:
ref: ${{ env.GIT_SHA }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale-action.yml
Expand Up @@ -13,7 +13,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@6f05e4244c9a0b2ed3401882b05d701dd0a7289b # v7.0.0
- uses: actions/stale@1160a2240286f5da8ec72b1c0816ce2481aabf84 # v8.0.0
with:
# Rate limit per run, (defaults to 30, but we've increased it to 40 for now).
operations-per-run: 40
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-data.yml
Expand Up @@ -15,7 +15,7 @@ jobs:
update-data:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2

- name: Set up Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
Expand All @@ -33,7 +33,7 @@ jobs:
run: yarn prettier-fix

- name: Create pull request
uses: peter-evans/create-pull-request@38e0b6e68b4c852a5500a94740f0e535e0d7ba54 # v4.2.4
uses: peter-evans/create-pull-request@5b4a9f6a9e2af26e5f02351490b90d01eb8ec1e5 # v5.0.0
with:
author: 'Renovate Bot <renovate@whitesourcesoftware.com>'
branch: 'chore/update-static-data'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ws_scan.yaml
Expand Up @@ -11,7 +11,7 @@ jobs:
WS_SCAN:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2

- name: Download UA
run: curl -LJO https://github.com/whitesource/unified-agent-distribution/releases/latest/download/wss-unified-agent.jar
Expand Down
1 change: 1 addition & 0 deletions .npmrc
@@ -1 +1,2 @@
save-exact = true
provenance = true
2 changes: 1 addition & 1 deletion .nvmrc
@@ -1 +1 @@
18.15.0
18.16.0
2 changes: 1 addition & 1 deletion docs/development/creating-editing-renovate-presets.md
@@ -1,6 +1,6 @@
# Creating/editing Renovate presets

Renovate comes with default presets that you can find in the `lib/config/presets/internal` directory.
Renovate comes with default presets that you can find in the [`lib/config/presets/internal`](https://github.com/renovatebot/renovate/tree/main/lib/config/presets/internal) directory.
You can suggest changes to the presets with a pull request.

Follow the rules below to increase the chance that your pull request gets merged.
Expand Down
10 changes: 8 additions & 2 deletions docs/development/local-development.md
Expand Up @@ -47,16 +47,22 @@ If you already installed a part, skip the corresponding step.
PS C:\Windows\system32> yarn --version
```

#### VS Code Remote Development
#### VS Code Dev Containers

If you are using [VS Code](https://code.visualstudio.com/) you can skip installing [the prerequisites](#prerequisites) and work in a [development container](https://code.visualstudio.com/docs/remote/containers) instead.
If you are using [VS Code](https://code.visualstudio.com/) you can skip installing [the prerequisites](#prerequisites) and work in a [development container](https://code.visualstudio.com/docs/devcontainers/containers) instead.

- Install the [Dev Containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) and [check its system requirements](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers#system-requirements)
- Open the repository folder in VS Code
- Choose "Reopen in Container" via the command palette or the small button in the lower left corner

The VS Code [integrated terminal](https://code.visualstudio.com/docs/editor/integrated-terminal) is now running in the container and can be used to run additional commands.

To build inside the container:

```shell
yarn build
```

#### Local Docker

If, for some reason, you can't run the relevant versions on your local machine, you can run everything from a Docker image.
Expand Down
7 changes: 5 additions & 2 deletions docs/usage/config-presets.md
Expand Up @@ -164,7 +164,7 @@ In short, the number of `{{argx}}` parameters in the definition is how many para
Parameters must be strings, non-quoted, and separated by commas if there are more than one.

If you find that you are repeating config a lot, you might consider publishing one of these types of parameterised presets yourself.
Or if you think your preset would be valuable for others, please contribute a PR to the Renovate repository.
Or if you think your preset would be valuable for others, please contribute a PR to the Renovate repository, see [Contributing to presets](#contributing-to-presets).

## GitHub-hosted Presets

Expand Down Expand Up @@ -211,7 +211,10 @@ Renovate will determine the current platform and look up the preset from there.
## Contributing to presets

Have you configured a rule that you think others might benefit from?
Please consider contributing it to the [Renovate](https://github.com/renovatebot/renovate) repository so that it gains higher visibility and saves others from reinventing the same thing.
Please consider contributing it to the [Renovate repository](https://github.com/renovatebot/renovate/tree/main/lib/config/presets/internal) so that it gains higher visibility and saves others from reinventing the same thing.

Create a [discussion](https://github.com/renovatebot/renovate/discussions) to propose your preset to the Renovate maintainers.
The maintainers can also help improve the preset, and let you know where to put it in the code.

## Organization level presets

Expand Down

0 comments on commit 056a77d

Please sign in to comment.