Skip to content

Commit

Permalink
Merge branch 'main' into chore/github-actions-vscode-extension
Browse files Browse the repository at this point in the history
  • Loading branch information
HonkingGoose committed Apr 18, 2023
2 parents a23bcdc + b00acdd commit 25b136e
Show file tree
Hide file tree
Showing 204 changed files with 5,779 additions and 3,485 deletions.
7 changes: 6 additions & 1 deletion .devcontainer/Dockerfile
@@ -1,6 +1,11 @@
FROM ghcr.io/containerbase/node:18.15.0@sha256:9242d234a62e8115286c8d77831b09f0a7def66da6f6e0c26f150416a5142383
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
29 changes: 18 additions & 11 deletions .devcontainer/devcontainer.json
@@ -1,22 +1,29 @@
{
"$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",
"github.vscode-github-actions"
]
}
},
"extensions": [
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"orta.vscode-jest",
"editorconfig.editorconfig",
"github.vscode-github-actions"
],
"runArgs": [
"--cap-add=SYS_PTRACE",
"--security-opt",
Expand Down
7 changes: 6 additions & 1 deletion .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 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@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # tag=v3.1.1
uses: codecov/codecov-action@40a12dcee2df644d47232dde008099a3e9e4f865 # v3.1.2
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@04df1262e6247151b5ac09cd2c303ac36ad3f62b # v2.2.9
uses: github/codeql-action/init@7df0ce34898d659f95c0c4a09eaa8d4e32ee64db # v2.2.12
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@04df1262e6247151b5ac09cd2c303ac36ad3f62b # v2.2.9
uses: github/codeql-action/autobuild@7df0ce34898d659f95c0c4a09eaa8d4e32ee64db # v2.2.12

# ℹ️ 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@04df1262e6247151b5ac09cd2c303ac36ad3f62b # v2.2.9
uses: github/codeql-action/analyze@7df0ce34898d659f95c0c4a09eaa8d4e32ee64db # v2.2.12
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
2 changes: 1 addition & 1 deletion .github/workflows/release-npm.yml
Expand Up @@ -38,7 +38,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
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
12 changes: 9 additions & 3 deletions docs/development/issue-labeling.md
Expand Up @@ -112,6 +112,7 @@ It does _not_ mean "amount of work for the maintainers".
platform:azure
platform:bitbucket
platform:bitbucket-server
platform:codecommit
platform:gitea
platform:github
platform:gitlab
Expand All @@ -127,6 +128,8 @@ Keep in mind that an issue can be both affecting a platform and a self-hosted in
<summary>Core labels</summary>

core:automerge
core:autoreplace
core:cache
core:changelogs
core:config
core:dashboard
Expand Down Expand Up @@ -182,15 +185,18 @@ Apply these labels when somebody opens a `feature` type issue requesting a new d
<details>
<summary>Housekeeping</summary>

duplicate
good first issue
help wanted
logs:problem
needs-code-formatting
reproduction:needed
reproduction:provided
duplicate

</details>

Add a label `duplicate` to issues/PRs that are a duplicate of an earlier issue/PR.

Add a label `good first issue` to issues that are small, easy to fix, and do-able for a newcomer.
This label is sometimes picked up by tools or websites that try to encourage people to contribute to open source.

Expand All @@ -202,11 +208,11 @@ Add a label `logs:problem` to indicate that there's a problem with the logs, and
1. Provide more logs (in case current logs are insufficient)
1. Format their logs properly

Add a label `needs-code-formatting` to issues with logs/code that needs to be formatted.

Add a label `reproduction:needed` if nobody's reproduced it in a public repo yet and such a reproduction is necessary before further work can be done.
Add the label `reproduction:provided` once there is a public reproduction.

Add a label `duplicate` to issues/PRs that are a duplicate of an earlier issue/PR.

### Self-hosted

<details>
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 25b136e

Please sign in to comment.