Skip to content
Snippets Groups Projects
Unverified Commit cf460434 authored by HonkingGoose's avatar HonkingGoose Committed by GitHub
Browse files

build: migrate from master branch to main (#8663)

parent e0488a3e
No related branches found
No related tags found
No related merge requests found
Showing with 22 additions and 22 deletions
...@@ -37,7 +37,7 @@ Copy/paste any log here, between the starting and ending backticks ...@@ -37,7 +37,7 @@ Copy/paste any log here, between the starting and ending backticks
**Have you created a minimal reproduction repository?** **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 have provided a minimal reproduction repository
- [ ] I don't have time for that, but it happens in a public repository I have linked to - [ ] I don't have time for that, but it happens in a public repository I have linked to
......
version: 1 version: 1
push: push:
branches: branches:
- '!master' - '!main'
pull_request: pull_request:
...@@ -16,7 +16,7 @@ If you've found a **bug** or have a **feature request** then please create an is ...@@ -16,7 +16,7 @@ If you've found a **bug** or have a **feature request** then please create an is
## Code ## Code
If you would like to fix a bug or implement a feature, please fork the repository and create a Pull Request. 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. 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. 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.
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
A minimal reproduction helps us with this. 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. We may close the issue if you have not provided a minimal reproduction within two weeks.
......
commitMessage: 'Apply prettier formatting fix' commitMessage: 'Apply prettier formatting fix'
excludeBranches: excludeBranches:
- master - main
pullsOnly: true pullsOnly: true
...@@ -24,7 +24,7 @@ I have verified these changes via: ...@@ -24,7 +24,7 @@ I have verified these changes via:
- [ ] No new tests but ran on a real repository, or - [ ] No new tests but ran on a real repository, or
- [ ] Both unit tests + ran on a real repository - [ ] 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. --> <!-- 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. --> <!-- PRs will always be squashed by us when we merge your work. Commit as many times as you need in this branch. -->
...@@ -3,7 +3,7 @@ name: build ...@@ -3,7 +3,7 @@ name: build
on: on:
push: push:
branches: branches:
- master - main
- v24 - v24
workflow_dispatch: workflow_dispatch:
...@@ -14,7 +14,7 @@ on: ...@@ -14,7 +14,7 @@ on:
env: env:
# Currently no way to detect automatically (#8153) # Currently no way to detect automatically (#8153)
DEFAULT_BRANCH: master DEFAULT_BRANCH: main
YARN_MODULES_CACHE_KEY: v1 YARN_MODULES_CACHE_KEY: v1
YARN_PACKAGE_CACHE_KEY: v1 YARN_PACKAGE_CACHE_KEY: v1
YARN_CACHE_FOLDER: .cache/yarn YARN_CACHE_FOLDER: .cache/yarn
......
...@@ -2,10 +2,10 @@ name: 'Code scanning - action' ...@@ -2,10 +2,10 @@ name: 'Code scanning - action'
on: on:
push: push:
branches: [master] branches: [main]
pull_request: pull_request:
# The branches below must be a subset of the branches above # The branches below must be a subset of the branches above
branches: [master] branches: [main]
schedule: schedule:
- cron: '0 13 * * 1' - cron: '0 13 * * 1'
......
...@@ -2,7 +2,7 @@ name: whitesource-scan ...@@ -2,7 +2,7 @@ name: whitesource-scan
on: on:
push: push:
branches: [master] branches: [main]
jobs: jobs:
WS_SCAN: WS_SCAN:
...@@ -14,4 +14,4 @@ jobs: ...@@ -14,4 +14,4 @@ jobs:
run: curl -LJO https://github.com/whitesource/unified-agent-distribution/releases/latest/download/wss-unified-agent.jar run: curl -LJO https://github.com/whitesource/unified-agent-distribution/releases/latest/download/wss-unified-agent.jar
- name: Run UA scan - 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
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
"channel": "v24" "channel": "v24"
}, },
{ {
"name": "master" "name": "main"
} }
] ]
} }
...@@ -80,7 +80,7 @@ This allows users to close unwelcome upgrade PRs and not worry about them being ...@@ -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. 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. 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. Note: `renovate` will only do this if the original branch hasn't been modified by anyone else.
......
...@@ -149,9 +149,9 @@ You usually don't need to fix any Prettier errors by hand. ...@@ -149,9 +149,9 @@ You usually don't need to fix any Prettier errors by hand.
## Keeping your Renovate fork up to date ## 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: To do this, see these GitHub guides:
[Configuring a remote for a fork](https://help.github.com/articles/configuring-a-remote-for-a-fork/) [Configuring a remote for a fork](https://help.github.com/articles/configuring-a-remote-for-a-fork/)
......
...@@ -26,7 +26,7 @@ Don't be afraid to ask for help. ...@@ -26,7 +26,7 @@ Don't be afraid to ask for help.
### Apply labels to issues ### Apply labels to issues
All issues should have labels attached to them. 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. In general try to make a good-faith effort to label things correctly.
......
...@@ -223,6 +223,6 @@ If/when this starts bothering you, add Renovate rules to reduce the volume, such ...@@ -223,6 +223,6 @@ If/when this starts bothering you, add Renovate rules to reduce the volume, such
## References ## 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. 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) 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)
...@@ -20,7 +20,7 @@ The same goes for any other third party binary tool like `gradle` or `poetry` - ...@@ -20,7 +20,7 @@ The same goes for any other third party binary tool like `gradle` or `poetry` -
### Docker ### Docker
Renovate is available for Docker via an automated build [renovate/renovate](https://hub.docker.com/r/renovate/renovate/). 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: For example, all the following are valid tags:
```sh ```sh
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
Automated dependency updates. Automated dependency updates.
Multi-platform and multi-language. 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) [![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/master/graph/badge.svg)](https://codecov.io/gh/renovatebot/renovate) [![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/) [![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) [![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 ...@@ -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` 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) - 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 ## Contributing
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment