From 9faad4e174ecc97b6d9978255c8304ec20733e44 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Fri, 12 Feb 2021 14:49:36 +0100 Subject: [PATCH 1/9] draft migrate to main --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- .github/auto-cancel-actions.yml | 2 +- .github/contributing.md | 2 +- .github/prettifier.yml | 2 +- .github/pull_request_template.md | 2 +- .github/workflows/build.yml | 6 +++--- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/ws_scan.yaml | 4 ++-- docs/development/design-decisions.md | 2 +- docs/development/local-development.md | 4 ++-- docs/development/triage-guide.md | 2 +- docs/usage/dependency-pinning.md | 2 +- readme.md | 6 +++--- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index e651a56a48b79d..c2ef2bcbdb04a0 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -28,7 +28,7 @@ Paste the *relevant* logs here, not the entire thing and not just a link to the **Have you created a minimal reproduction repository?** -Please read the [minimal reproductions documentation](https://github.com/renovatebot/renovate/blob/master/docs/development/minimal-reproductions.md) to learn how to make a good minimal reproduction repository. +Please read the [minimal reproductions documentation](https://github.com/renovatebot/renovate/blob/main/docs/development/minimal-reproductions.md) to learn how to make a good minimal reproduction repository. - [ ] This is a really small bug, it does not need a reproduction (think small typo) - [ ] I have provided a minimal reproduction repository diff --git a/.github/auto-cancel-actions.yml b/.github/auto-cancel-actions.yml index 901ddfc5ee6c61..cfdd9c1527ce0b 100644 --- a/.github/auto-cancel-actions.yml +++ b/.github/auto-cancel-actions.yml @@ -1,5 +1,5 @@ version: 1 push: branches: - - '!master' + - '!main' pull_request: diff --git a/.github/contributing.md b/.github/contributing.md index ad9f3418782832..2a3f581c9bd126 100644 --- a/.github/contributing.md +++ b/.github/contributing.md @@ -16,7 +16,7 @@ If you've found a **bug** or have a **feature request** then please create an is ## Code If you would like to fix a bug or implement a feature, please fork the repository and create a Pull Request. -More information on getting set up locally can be found in [docs/development/local-development.md](https://github.com/renovatebot/renovate/blob/master/docs/development/local-development.md). +More information on getting set up locally can be found in [docs/development/local-development.md](https://github.com/renovatebot/renovate/blob/main/docs/development/local-development.md). Before you start any Pull Request, it's recommended that you create an issue to discuss first if you have any doubts about requirement or implementation. That way you can be sure that the maintainer(s) agree on what to change and how, and you can hopefully get a quick merge afterwards. diff --git a/.github/prettifier.yml b/.github/prettifier.yml index b947472423e4c3..f05a3bc764aae2 100644 --- a/.github/prettifier.yml +++ b/.github/prettifier.yml @@ -1,4 +1,4 @@ commitMessage: 'Apply prettier formatting fix' excludeBranches: - - master + - main pullsOnly: true diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 119d5e8a2dc122..04df248f5066c7 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -24,7 +24,7 @@ I have verified these changes via: - [ ] No new tests but ran on a real repository, or - [ ] Both unit tests + ran on a real repository - + diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 84cfc68121aed3..6c2c910fe93dc8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ name: build on: push: branches: - - master + - main - 'renovate/**' pull_request: @@ -203,10 +203,10 @@ jobs: run: yarn install --frozen-lockfile - name: semantic-release - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' run: | echo '//registry.npmjs.org/:_authToken=${NPM_TOKEN}' >> ~/.npmrc - npx semantic-release --dry-run ${{github.ref != 'refs/heads/master'}} --ci ${{github.ref == 'refs/heads/master'}} + npx semantic-release --dry-run ${{github.ref != 'refs/heads/main'}} --ci ${{github.ref == 'refs/heads/main'}} env: GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index e2fed2d20a604b..03e6566f709937 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -2,10 +2,10 @@ name: 'Code scanning - action' on: push: - branches: [master] + branches: [main] pull_request: # The branches below must be a subset of the branches above - branches: [master] + branches: [main] schedule: - cron: '0 13 * * 1' diff --git a/.github/workflows/ws_scan.yaml b/.github/workflows/ws_scan.yaml index d264533f6132b5..b4b6003775ead5 100644 --- a/.github/workflows/ws_scan.yaml +++ b/.github/workflows/ws_scan.yaml @@ -2,7 +2,7 @@ name: whitesource-scan on: push: - branches: [master] + branches: [main] jobs: WS_SCAN: @@ -14,4 +14,4 @@ jobs: run: curl -LJO https://github.com/whitesource/unified-agent-distribution/releases/latest/download/wss-unified-agent.jar - name: Run UA scan - run: java -jar wss-unified-agent.jar -d $GITHUB_WORKSPACE -noConfig true -apiKey ${{ secrets.WS_ORG_TOKEN }} -product W4D -project "Renovate OS - master" -resolveAllDependencies false -npm_resolveDependencies true + run: java -jar wss-unified-agent.jar -d $GITHUB_WORKSPACE -noConfig true -apiKey ${{ secrets.WS_ORG_TOKEN }} -product W4D -project "Renovate OS - main" -resolveAllDependencies false -npm_resolveDependencies true diff --git a/docs/development/design-decisions.md b/docs/development/design-decisions.md index 115488804e6ee1..1938a8fa7d9950 100644 --- a/docs/development/design-decisions.md +++ b/docs/development/design-decisions.md @@ -80,7 +80,7 @@ This allows users to close unwelcome upgrade PRs and not worry about them being With the default behavior of one branch per dependency, it's often the case that a PR gets merge conflicts after an adjacent dependency update is merged. Although platforms often have a web interface for simple merge conflicts, this is still annoying to resolve manually. -`renovate` will rebase any unmergeable branches and add the latest necessary commit on top of the most recent `master` commit. +`renovate` will rebase any unmergeable branches and add the latest necessary commit on top of the most recent `main` commit. Note: `renovate` will only do this if the original branch hasn't been modified by anyone else. diff --git a/docs/development/local-development.md b/docs/development/local-development.md index e6f0c6ba8a3068..1ddf4bdedb8e88 100644 --- a/docs/development/local-development.md +++ b/docs/development/local-development.md @@ -163,9 +163,9 @@ You usually shouldn't need to fix any Prettier errors manually. ## Keeping your Renovate fork up to date -First of all, never commit to `master` of your fork - always use a branch like `feat/1234-add-yarn-parsing`. +First of all, never commit to `main` of your fork - always use a branch like `feat/1234-add-yarn-parsing`. -Then, make sure your fork is up to date with `master` each time before creating a new branch. To do this, see these GitHub guides: +Then, make sure your fork is up to date with `main` each time before creating a new branch. To do this, see these GitHub guides: [Configuring a remote for a fork](https://help.github.com/articles/configuring-a-remote-for-a-fork/) diff --git a/docs/development/triage-guide.md b/docs/development/triage-guide.md index 10f42c79bdc8b0..796863a58c4dcb 100644 --- a/docs/development/triage-guide.md +++ b/docs/development/triage-guide.md @@ -26,7 +26,7 @@ Don't be afraid to ask for help. ### Apply labels to issues All issues should have labels attached to them. -Read the [issue-labeling guide](https://github.com/renovatebot/renovate/blob/master/docs/development/issue-labeling.md) to get all the necessary info. +Read the [issue-labeling guide](https://github.com/renovatebot/renovate/blob/main/docs/development/issue-labeling.md) to get all the necessary info. In general try to make a good-faith effort to label things correctly. diff --git a/docs/usage/dependency-pinning.md b/docs/usage/dependency-pinning.md index 118aa7b76b69ac..673289320378dc 100644 --- a/docs/usage/dependency-pinning.md +++ b/docs/usage/dependency-pinning.md @@ -223,6 +223,6 @@ If/when this starts bothering you, add Renovate rules to reduce the volume, such ## References This is a "living" document and we plan to update it whenever we think of something new or someone makes a valid point we've missed or misunderstood. -[GitHub Location](https://github.com/renovatebot/renovate/blob/master/website/docs/dependency-pinning.md) +[GitHub Location](https://github.com/renovatebot/renovate/blob/main/website/docs/dependency-pinning.md) Updated 2018-01-19 after [excellent feedback on lockfiles](https://github.com/commitizen/cz-conventional-changelog-default-export/pull/4#issuecomment-358038966) by [@LinusU](https://github.com/LinusU) diff --git a/readme.md b/readme.md index d97d7c60c6715f..e69d66d0991102 100644 --- a/readme.md +++ b/readme.md @@ -5,8 +5,8 @@ Automated dependency updates. Multi-platform and multi-language. -[![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://raw.githubusercontent.com/renovatebot/renovate/master/license) -[![codecov](https://codecov.io/gh/renovatebot/renovate/branch/master/graph/badge.svg)](https://codecov.io/gh/renovatebot/renovate) +[![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://raw.githubusercontent.com/renovatebot/renovate/main/license) +[![codecov](https://codecov.io/gh/renovatebot/renovate/branch/main/graph/badge.svg)](https://codecov.io/gh/renovatebot/renovate) [![Renovate enabled](https://img.shields.io/badge/renovate-enabled-brightgreen.svg)](https://renovatebot.com/) [![Build status](https://github.com/renovatebot/renovate/workflows/build/badge.svg)](https://github.com/renovatebot/renovate/actions) @@ -65,7 +65,7 @@ If you are not on github.com or gitlab.com, or you prefer to run your own instan - Run the `renovate/renovate` Docker Hub image (same content/versions as the CLI tool), run it on a schedule - Run the `renovate/renovate:slim` Docker Hub image if you only use package managers that don't need third party binaries (e.g. JS, Docker, Nuget, pip) -[More details on the self-hosting development](https://github.com/renovatebot/renovate/blob/master/docs/usage/self-hosting.md). +[More details on the self-hosting development](https://github.com/renovatebot/renovate/blob/main/docs/usage/self-hosting.md). ## Contributing From c755585154060ea4970ef811df74b3e44b5872a5 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Tue, 16 Feb 2021 21:09:22 +0100 Subject: [PATCH 2/9] update link in label bot message --- .github/label-actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/label-actions.yml b/.github/label-actions.yml index 765fad9d8252f4..aea794d3b4d686 100644 --- a/.github/label-actions.yml +++ b/.github/label-actions.yml @@ -6,7 +6,7 @@ To fix the problem, we first need to know exactly what's causing the bug. A minimal reproduction help us to pinpoint the exact cause of the bug. - To get started, please read our guide on [minimal reproductions](https://github.com/renovatebot/renovate/blob/master/docs/development/minimal-reproductions.md) to understand what is needed. + To get started, please read our guide on [minimal reproductions](https://github.com/renovatebot/renovate/blob/main/docs/development/minimal-reproductions.md) to understand what is needed. We may close the issue if you have not provided a minimal reproduction within two weeks. If you need more time, or are stuck, please ask for help or more time in a comment. From 56ada678fd22849afd3ba5bcb0d55a9ea94a9de0 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 3 Mar 2021 15:44:45 +0100 Subject: [PATCH 3/9] fixup after merge --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cca3ab589cf92c..3ea85cb1d150a8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ name: build on: push: branches: - - master + - main workflow_dispatch: From 9a7f604bc174a88e4816ddfec0bc857b4679486b Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Thu, 1 Apr 2021 13:00:39 +0200 Subject: [PATCH 4/9] add branches: main to .releaserc Semantic-release bot does not support a main branch by default yet. So we need to configure the branch manually. I've copy/pasted the config from: https://semantic-release.gitbook.io/semantic-release/usage/workflow-configuration#name and adapted it to use a main branch. --- .releaserc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.releaserc b/.releaserc index 625c7479a8e760..c1da70d60f1afd 100644 --- a/.releaserc +++ b/.releaserc @@ -1,4 +1,7 @@ { + branches: [ + {name: 'main'}, + ] "plugins": [ "@semantic-release/commit-analyzer", "@semantic-release/release-notes-generator", From 141a1c18f519bc326f3e83c3e4fed32e38486c15 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Thu, 1 Apr 2021 13:03:29 +0200 Subject: [PATCH 5/9] add missing comma to branches array for. releaserc --- .releaserc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.releaserc b/.releaserc index c1da70d60f1afd..3f5886b5566748 100644 --- a/.releaserc +++ b/.releaserc @@ -1,7 +1,7 @@ { branches: [ {name: 'main'}, - ] + ], "plugins": [ "@semantic-release/commit-analyzer", "@semantic-release/release-notes-generator", From ba68e68e636a22853ed5628fcc89a2a731c56015 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Thu, 1 Apr 2021 13:19:43 +0200 Subject: [PATCH 6/9] apply viceice's suggestion for the branch config Co-authored-by: Michael Kriese --- .releaserc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.releaserc b/.releaserc index 3f5886b5566748..90bf20a4b2ea3d 100644 --- a/.releaserc +++ b/.releaserc @@ -1,7 +1,5 @@ { - branches: [ - {name: 'main'}, - ], + "branches": ["main"], "plugins": [ "@semantic-release/commit-analyzer", "@semantic-release/release-notes-generator", From 9d050075c09c25255a9d4a53def674d812ce4fc6 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Wed, 21 Apr 2021 22:33:12 +0200 Subject: [PATCH 7/9] fixup .releaserc file --- .releaserc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.releaserc b/.releaserc index 2dd95796eb21ec..9b2d1fa5f896d6 100644 --- a/.releaserc +++ b/.releaserc @@ -1,5 +1,4 @@ { - "branches": ["main"], "plugins": [ "@semantic-release/commit-analyzer", "@semantic-release/release-notes-generator", @@ -91,7 +90,7 @@ "channel": "v24" }, { - "name": "master" + "name": "main" } ] } From 72c8c7a26fd85b3244900847241b8aebf13d2a95 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Thu, 22 Apr 2021 09:48:51 +0200 Subject: [PATCH 8/9] chore: fix default branch --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f40df7b13d4b14..841316ae3ffce8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ on: env: # Currently no way to detect automatically (#8153) - DEFAULT_BRANCH: master + DEFAULT_BRANCH: main YARN_MODULES_CACHE_KEY: v1 YARN_PACKAGE_CACHE_KEY: v1 YARN_CACHE_FOLDER: .cache/yarn From 0c44d41fd86103fc0f45cb3b0f74988148d438df Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Thu, 22 Apr 2021 10:20:55 +0200 Subject: [PATCH 9/9] docs: update master reference --- docs/usage/self-hosting.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/usage/self-hosting.md b/docs/usage/self-hosting.md index d17d179c95bc14..199b3c3965debb 100644 --- a/docs/usage/self-hosting.md +++ b/docs/usage/self-hosting.md @@ -20,7 +20,7 @@ The same goes for any other third party binary tool like `gradle` or `poetry` - ### Docker Renovate is available for Docker via an automated build [renovate/renovate](https://hub.docker.com/r/renovate/renovate/). -It builds `latest` based on the `master` branch and all semver tags are published too. +It builds `latest` based on the `main` branch and all semver tags are published too. For example, all the following are valid tags: ```sh