Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: migrate from master branch to main #8663

Merged
merged 20 commits into from Apr 22, 2021
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Expand Up @@ -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.

- [ ] This is a really small bug, it does not need a reproduction (think small typo)
- [ ] I have provided a minimal reproduction repository
Expand Down
2 changes: 1 addition & 1 deletion .github/auto-cancel-actions.yml
@@ -1,5 +1,5 @@
version: 1
push:
branches:
- '!master'
- '!main'
pull_request:
2 changes: 1 addition & 1 deletion .github/contributing.md
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion .github/label-actions.yml
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion .github/prettifier.yml
@@ -1,4 +1,4 @@
commitMessage: 'Apply prettier formatting fix'
excludeBranches:
- master
- main
pullsOnly: true
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Expand Up @@ -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. -->
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Expand Up @@ -3,7 +3,7 @@ name: build
on:
push:
branches:
- master
- main

workflow_dispatch:

Expand Down Expand Up @@ -190,10 +190,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 }}
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Expand Up @@ -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'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ws_scan.yaml
Expand Up @@ -2,7 +2,7 @@ name: whitesource-scan

on:
push:
branches: [master]
branches: [main]

jobs:
WS_SCAN:
Expand All @@ -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
3 changes: 3 additions & 0 deletions .releaserc
@@ -1,4 +1,7 @@
{
branches: [
{name: 'main'},
],
HonkingGoose marked this conversation as resolved.
Show resolved Hide resolved
"plugins": [
"@semantic-release/commit-analyzer",
"@semantic-release/release-notes-generator",
Expand Down
2 changes: 1 addition & 1 deletion docs/development/design-decisions.md
Expand Up @@ -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.

Expand Down
4 changes: 2 additions & 2 deletions docs/development/local-development.md
Expand Up @@ -150,9 +150,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/)
Expand Down
2 changes: 1 addition & 1 deletion docs/development/triage-guide.md
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion docs/usage/dependency-pinning.md
Expand Up @@ -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)
6 changes: 3 additions & 3 deletions readme.md
Expand Up @@ -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)

Expand Down Expand Up @@ -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

Expand Down