Skip to content

Commit

Permalink
Change all references of "master" to "main"
Browse files Browse the repository at this point in the history
  • Loading branch information
leviem1 committed Aug 17, 2020
1 parent 3469627 commit 1a48428
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ updates:
directory: "/"
schedule:
interval: "weekly"
target-branch: "master"
target-branch: "main"
reviewers:
- "leviem1"
- package-ecosystem: "gradle"
directory: "/"
schedule:
interval: "weekly"
target-branch: "master"
target-branch: "main"
reviewers:
- "leviem1"
4 changes: 2 additions & 2 deletions .github/workflows/artifact.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Build and Artifact
on:
pull_request:
branches:
- 'master'
- 'main'
push:
branches:
- 'master'
- 'main'

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Build and Check
on:
push:
branches-ignore:
- 'master'
- 'main'

jobs:
build:
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ A template for building PaperMC plugins!
## Features
### Github Actions 🎬
* Draft release on tag push
* Build artifact on pull requests and pushes to master
* Build artifact on pull requests and pushes to main
* Build and check on all other branches

### Bots 🤖
Expand Down Expand Up @@ -116,18 +116,18 @@ permissions:
## Creating a Release
Below are the steps you should follow to create a release.

1. Create a tag on `master` using semantic versioning (e.g. v0.1.0)
1. Create a tag on `main` using semantic versioning (e.g. v0.1.0)
2. Push the tag and get some coffee while the workflows run
3. Add a description to the release draft once it's been automatically created

## Contributing
### General workflow
1. First, pull any changes from `master` to make sure you're up-to-date
2. Create a branch from `master`
1. First, pull any changes from `main` to make sure you're up-to-date
2. Create a branch from `main`
* Give your branch a name that describes your change (e.g. add-scoreboard)
* Focus on one change per branch
* Keep your commits small, and write descriptive commit messages
3. When you're ready, create a pull request to `master` with a descriptive title, and listing any changes made in its description
3. When you're ready, create a pull request to `main` with a descriptive title, and listing any changes made in its description
* Link any issues that your pull request is related to as well

#### Example:
Expand All @@ -138,7 +138,7 @@ ADDED - Scoreboard displayed at in-game at game end
CHANGED - Updated `StorageManager` class to persist scoreboard data
```
After the pull request is reviewed, approved, and passes all automated checks, it will be merged into master.
After the pull request is reviewed, approved, and passes all automated checks, it will be merged into main.
### Building locally
Thanks to [Gradle](https://gradle.org/), building locally is easy no matter what platform you're on. Simply run the following command:
Expand Down

0 comments on commit 1a48428

Please sign in to comment.