diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index c0b87e4faac295c777aeb7fc4301c431919d82b3..b1930fcb1fa3c9d9560158647b86447a73eaed4c 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -37,7 +37,7 @@ Copy/paste any log here, between the starting and ending backticks **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. - [ ] I have provided a minimal reproduction repository - [ ] I don't have time for that, but it happens in a public repository I have linked to diff --git a/.github/auto-cancel-actions.yml b/.github/auto-cancel-actions.yml index 901ddfc5ee6c61cb0bc762543d55fdfc9d353b07..cfdd9c1527ce0b94f549f24693ba237f72c3df31 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 ad9f34187828323c26e63014b922bf62b21bb065..2a3f581c9bd12673fdfed8554d55d59c2e2c7542 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/label-actions.yml b/.github/label-actions.yml index c1fc61728c79d07fe7b4ac7dad9ae4c37778e0f6..0a9f4560ed87e78b468712869979ca6fa216cbd6 100644 --- a/.github/label-actions.yml +++ b/.github/label-actions.yml @@ -8,7 +8,7 @@ A minimal reproduction helps us with this. - 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. diff --git a/.github/prettifier.yml b/.github/prettifier.yml index b947472423e4c3fb82b4baeb79e48860036d8862..f05a3bc764aae2900698fb3d55343b8852e18d45 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 119d5e8a2dc12243096b6bef2080b6f8140e8b50..04df248f5066c725c928756ccc758a3b64611004 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 -<!-- Do you have any suggestions about this PR template? Edit it here: https://github.com/renovatebot/renovate/edit/master/.github/pull_request_template.md --> +<!-- Do you have any suggestions about this PR template? Edit it here: https://github.com/renovatebot/renovate/edit/main/.github/pull_request_template.md --> <!-- Please do not force push to your PR's branch after you have created your PR, as doing so forces us to review the whole PR again. This makes it harder for us to review your work because we don't know what has changed. --> <!-- PRs will always be squashed by us when we merge your work. Commit as many times as you need in this branch. --> diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7dccfacde6a1bb1d0de5940de42441e3d3fe34b0..841316ae3ffce8e9ee79f4b153aa439a00974e8e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ name: build on: push: branches: - - master + - main - v24 workflow_dispatch: @@ -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 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index e2fed2d20a604bb71daaf062635cffc041b00264..03e6566f709937eab9cce983df470102d2aea59d 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 d264533f6132b5f868b1f06393f71436a2857355..b4b6003775ead5d7b058eaa743f3682dc0304d0d 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/.releaserc b/.releaserc index e6ca1a4e3d47cc994da619c544365f215174325f..9b2d1fa5f896d6c09fca4b33aa77c147b1bb0103 100644 --- a/.releaserc +++ b/.releaserc @@ -90,7 +90,7 @@ "channel": "v24" }, { - "name": "master" + "name": "main" } ] } diff --git a/docs/development/design-decisions.md b/docs/development/design-decisions.md index 51526ce7d3c3d8701b40067b4dc50e329994ec37..240640799f4f968dcde346f681e408118ef5b423 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 da8d7ac4678e63e2244308e4bdf6f9b525c1a34f..75c10b72ea6b2b3966e05cff2ea5200f7b8b08fb 100644 --- a/docs/development/local-development.md +++ b/docs/development/local-development.md @@ -149,9 +149,9 @@ You usually don't need to fix any Prettier errors by hand. ## Keeping your Renovate fork up to date -First of all, never commit to the `master` branch of your fork - always use a "feature" branch like `feat/1234-add-yarn-parsing`. +First of all, never commit to the `main` branch of your fork - always use a "feature" branch like `feat/1234-add-yarn-parsing`. -Make sure your fork is up to date with the Renovate `master` branch, check this each time before you create a new branch. +Make sure your fork is up to date with the Renovate `main` branch, check this each time before you create 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 10f42c79bdc8b0cba6af173795e25eaadc6e4f89..796863a58c4dcbf8965930034668c23a00c2ecc0 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 5329ab5a7e3a49d1950cbb3c2dcd00f58a62c8d8..909f647984b5d404b7a186c018f42706ed73462d 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/docs/usage/self-hosting.md b/docs/usage/self-hosting.md index d17d179c95bc148034077bc625469750dd118329..199b3c3965debb4a2ab2d58fb0f3c96f09c0878f 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 diff --git a/readme.md b/readme.md index df5f704c90fedd331f20c289ad76d4bdb649f49c..dd2f2ecf68b505c54dd580add8f8a71a1a08c427 100644 --- a/readme.md +++ b/readme.md @@ -5,8 +5,8 @@ Automated dependency updates. Multi-platform and multi-language. -[](https://raw.githubusercontent.com/renovatebot/renovate/master/license) -[](https://codecov.io/gh/renovatebot/renovate) +[](https://raw.githubusercontent.com/renovatebot/renovate/main/license) +[](https://codecov.io/gh/renovatebot/renovate) [](https://renovatebot.com/) [](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