Merge branch 'main' into test/e2e-4-all

This commit is contained in:
Michael Kriese 2021-08-23 10:08:43 +02:00 committed by GitHub
commit b76fa8c7a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 766 additions and 954 deletions

24
.github/renovate.json vendored
View file

@ -1,15 +1,23 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["github>renovatebot/presets-internal:node", ":pinDependencies"],
"major": {
"stabilityDays": 3
},
"extends": ["github>renovatebot/.github", ":pinDependencies"],
"packageRules": [
{
"description": "Automerge Renovate updates",
"packageNames": ["renovate/renovate"],
"updateTypes": ["major", "minor", "patch"],
"semanticCommitType": "fix"
},
{
"description": "Update references in markdown files weekly",
"matchPaths": [".md"],
"extends": ["schedule:weekly"],
"automerge": true,
"stabilityDays": 0,
"commitMessageTopic": "references to {{{depName}}}",
"semanticCommitType": "docs",
"semanticCommitScope": null,
"additionalBranchPrefix": "docs-"
}
],
"regexManagers": [
@ -19,6 +27,14 @@
"// renovate: datasource=(?<datasource>[a-z-]+?) depName=(?<depName>.+?)(?: versioning=(?<versioning>[a-z-]+?))?\\s+readonly\\s+tag\\s+=\\s+'(?<currentValue>.+?)';"
],
"versioningTemplate": "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}"
},
{
"fileMatch": ["^README\\.md$"],
"matchStrings": [
"uses: renovatebot/github-action@(?<currentValue>[^\\s]+)"
],
"depNameTemplate": "renovatebot/github-action",
"datasourceTemplate": "github-releases"
}
]
}

View file

@ -3,7 +3,7 @@ name: Build
on:
push:
branches:
- master
- main
- 'renovate/**'
pull_request:
@ -13,21 +13,22 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2.3.4
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # renovate: tag=v2.3.4
with:
fetch-depth: 0
- name: Lint commit messages
uses: wagoid/commitlint-github-action@v3.0.6
uses: wagoid/commitlint-github-action@baffd3c16c570c0a26bf89be729b81bb796e9bd5 # renovate: tag=v3.1.4
lint:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2.3.4
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # renovate: tag=v2.3.4
- name: Setup node
uses: actions/setup-node@v2.1.5
uses: actions/setup-node@25316bbc1f10ac9d8798711f44914b1cf3c4e954 # renovate: tag=v2.4.0
with:
node-version: '12.x'
cache: 'npm'
- name: Install project
run: npm ci
- name: Lint
@ -41,7 +42,7 @@ jobs:
configurationFile: [example/renovate-config.js, example/renovate.json]
steps:
- name: Checkout
uses: actions/checkout@v2.3.4
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # renovate: tag=v2.3.4
- name: Install project
run: npm ci
- name: Build
@ -66,10 +67,10 @@ jobs:
if: |
startsWith(github.event.commits[0].message,
'fix(deps): update renovate/renovate docker tag ')
&& github.ref == 'refs/heads/master'
&& github.ref == 'refs/heads/main'
steps:
- name: Checkout
uses: actions/checkout@v2.3.4
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # renovate: tag=v2.3.4
with:
fetch-depth: 0
ref: 'release'
@ -79,11 +80,11 @@ jobs:
run: |
git config --local user.name "github-actions[bot]"
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
- name: Merge master
- name: Merge main
run: |
git merge -m 'chore(release): merge master (${{ github.sha }})' ${{ github.sha }}
git merge -m 'chore(release): merge main (${{ github.sha }})' ${{ github.sha }}
- name: Setup node
uses: actions/setup-node@v2.1.5
uses: actions/setup-node@25316bbc1f10ac9d8798711f44914b1cf3c4e954 # renovate: tag=v2.4.0
with:
node-version: '12.x'
- name: Install project
@ -104,7 +105,7 @@ jobs:
- name: Publish release
run: git push --follow-tags
- name: Publish GitHub release
uses: actions/create-release@v1.1.4
uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e # renovate: tag=v1.1.4
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:

View file

@ -11,7 +11,9 @@ GitHub Action to run Renovate self-hosted.
- [`configurationFile`](#configurationfile)
- [`token`](#token)
- [Example](#example)
- [License](#license)
- [Troubleshooting](#troubleshooting)
- [Debug Logging](#debug-logging)
- [Special token requirements when using the `github-actions` manager](#special-token-requirements-when-using-the-github-actions-manager)
## Badges
@ -51,6 +53,8 @@ If you want to use this with just the single configuration file, make sure to in
Note that the [`GITHUB_TOKEN`](https://help.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token#permissions-for-the-github_token) secret can't be used for authenticating Renovate.
If you want to use the `github-actions` manager, you must setup a [special token](#special-token-requirements-when-using-the-github-actions-manager) with some requirements.
## Example
This example uses a personal access token and will run every 15 minutes. The personal access token is configured as a GitHub secret named `RENOVATE_TOKEN`. This example uses the [`example/config.js`](./example/config.js) file as configuration.
@ -72,7 +76,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v2.0.0
- name: Self-hosted Renovate
uses: renovatebot/github-action@v21.30.0
uses: renovatebot/github-action@v21.33.15
with:
configurationFile: example/renovate-config.js
token: ${{ secrets.RENOVATE_TOKEN }}
@ -120,8 +124,30 @@ jobs:
uses: actions/checkout@v2.0.0
- name: Self-hosted Renovate
uses: renovatebot/github-action@v21.30.0
uses: renovatebot/github-action@v21.33.15
with:
configurationFile: example/renovate-config.js
token: 'x-access-token:${{ steps.get_token.outputs.app_token }}'
```
## Troubleshooting
### Debug logging
In case of issues, it's always a good idea to enable debug logging first.
To enable debug logging, add the environment variable `LOG_LEVEL: 'debug'` to the action:
```yml
- name: Self-hosted Renovate
uses: renovatebot/github-action@v21.33.15
with:
configurationFile: example/renovate-config.js
token: ${{ secrets.RENOVATE_TOKEN }}
env:
LOG_LEVEL: 'debug'
```
### Special token requirements when using the `github-actions` manager
If you want to use the `github-actions` [manager](https://docs.renovatebot.com/modules/manager/github-actions/) in Renovate, ensure that the `token` you provide contains the `workflow` scope.
Otherwise, GitHub does not allow Renovate to update worklow files and therefore it will be unable to create update PRs for affected packages (like `actions/checkout` or `renovatebot/github-action` itself).

1607
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -31,27 +31,27 @@
},
"homepage": "https://github.com/renovatebot/github-action#readme",
"dependencies": {
"@actions/core": "1.2.6",
"@actions/exec": "1.0.4"
"@actions/core": "1.4.0",
"@actions/exec": "1.1.0"
},
"devDependencies": {
"@commitlint/cli": "12.0.1",
"@commitlint/config-conventional": "12.0.1",
"@types/node": "13.13.45",
"@typescript-eslint/eslint-plugin": "4.6.0",
"@typescript-eslint/parser": "4.6.0",
"@vercel/ncc": "0.27.0",
"concurrently": "6.0.0",
"eslint": "7.12.1",
"eslint-config-prettier": "8.1.0",
"@commitlint/cli": "12.1.4",
"@commitlint/config-conventional": "12.1.4",
"@types/node": "13.13.52",
"@typescript-eslint/eslint-plugin": "4.29.1",
"@typescript-eslint/parser": "4.29.1",
"@vercel/ncc": "0.29.1",
"concurrently": "6.2.1",
"eslint": "7.32.0",
"eslint-config-prettier": "8.3.0",
"eslint-plugin-json": "2.1.2",
"eslint-plugin-prettier": "3.1.4",
"eslint-plugin-prettier": "3.4.0",
"husky": "4.3.8",
"lint-staged": "10.5.4",
"npm-run-all": "4.1.5",
"prettier": "2.2.1",
"standard-version": "9.1.1",
"prettier": "2.3.2",
"standard-version": "9.3.1",
"ts-node": "9.1.1",
"typescript": "4.2.2"
"typescript": "4.3.5"
}
}

View file

@ -1,7 +1,7 @@
class Docker {
readonly repository = 'renovate/renovate';
// renovate: datasource=docker depName=renovate/renovate versioning=docker
readonly tag = '24.76.0-slim';
readonly tag = '26.4.2-slim';
readonly tagSuffix = '-slim';
image(): string {