OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-26 14:30:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update branch name references

Browse source
This commit is contained in:
Nassim Jahnke 2024-12-21 14:03:02 +01:00
parent 7490b311ff
commit fd4c10947f
No known key found for this signature in database
GPG key ID: EF6771C01F6EF02F
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/close_invalid_prs.yml vendored
View file

@ -9,19 +9,19 @@ jobs:
if: | if: |
github.repository != github.event.pull_request.head.repo.full_name && github.repository != github.event.pull_request.head.repo.full_name &&
( (
github.head_ref == 'master' || github.head_ref == 'main' ||
github.event.pull_request.head.repo.owner.type != 'User' github.event.pull_request.head.repo.owner.type != 'User'
) )
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: superbrothers/close-pull-request@v3 - uses: superbrothers/close-pull-request@v3
id: "master_branch" id: "main_branch"
if: github.head_ref == 'master' if: github.head_ref == 'main'
with: with:
comment: "Please do not open pull requests from the `master` branch, create a new branch instead." comment: "Please do not open pull requests from the `main` branch, create a new branch instead."
- uses: superbrothers/close-pull-request@v3 - uses: superbrothers/close-pull-request@v3
id: "org_account" id: "org_account"
if: github.event.pull_request.head.repo.owner.type != 'User' && steps.master_branch.outcome == 'skipped' if: github.event.pull_request.head.repo.owner.type != 'User' && steps.main_branch.outcome == 'skipped'
with: with:
comment: "Please do not open pull requests from non-user accounts like organizations. Create a fork on a user account instead." comment: "Please do not open pull requests from non-user accounts like organizations. Create a fork on a user account instead."

6
CONTRIBUTING.md
View file

@ -185,11 +185,11 @@ need to "save" the changes.
## Rebasing PRs ## Rebasing PRs
Steps to rebase a PR to include the latest changes from `master`. Steps to rebase a PR to include the latest changes from `main`.
These steps assume the `origin` remote is your fork of this repository and `upstream` is the official PaperMC repository. These steps assume the `origin` remote is your fork of this repository and `upstream` is the official PaperMC repository.
1. Pull the latest changes from upstreams master: `git switch main && git pull upstream main`. 1. Pull the latest changes from upstreams main: `git switch main && git pull upstream main`.
1. Checkout feature/fix branch and rebase on master: `git checkout patch-branch && git rebase main`. 1. Checkout feature/fix branch and rebase on main: `git checkout patch-branch && git rebase main`.
1. Apply updated patches: `./gradlew applyPatches`. 1. Apply updated patches: `./gradlew applyPatches`.
1. If there are conflicts, fix them. 1. If there are conflicts, fix them.
1. If your PR creates new feature patches instead of modifying existing ones, ensure your newly-created patch is the last commit by either: 1. If your PR creates new feature patches instead of modifying existing ones, ensure your newly-created patch is the last commit by either:

2
README.md
View file

@ -1,4 +1,4 @@
Paper [![Paper Build Status](https://img.shields.io/github/actions/workflow/status/PaperMC/Paper/build.yml?branch=master)](https://github.com/PaperMC/Paper/actions) Paper [![Paper Build Status](https://img.shields.io/github/actions/workflow/status/PaperMC/Paper/build.yml?branch=main)](https://github.com/PaperMC/Paper/actions)
[![Discord](https://img.shields.io/discord/289587909051416579.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/papermc) [![Discord](https://img.shields.io/discord/289587909051416579.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/papermc)
[![GitHub Sponsors](https://img.shields.io/github/sponsors/papermc?label=GitHub%20Sponsors)](https://github.com/sponsors/PaperMC) [![GitHub Sponsors](https://img.shields.io/github/sponsors/papermc?label=GitHub%20Sponsors)](https://github.com/sponsors/PaperMC)
[![Open Collective](https://img.shields.io/opencollective/all/papermc?label=OpenCollective%20Sponsors)](https://opencollective.com/papermc) [![Open Collective](https://img.shields.io/opencollective/all/papermc?label=OpenCollective%20Sponsors)](https://opencollective.com/papermc)

2
settings.gradle.kts
View file

@ -24,7 +24,7 @@ if (!file(".git").exists()) {
Built Paper jars are available for download at Built Paper jars are available for download at
https://papermc.io/downloads/paper https://papermc.io/downloads/paper
See https://github.com/PaperMC/Paper/blob/master/CONTRIBUTING.md See https://github.com/PaperMC/Paper/blob/main/CONTRIBUTING.md
for further information on building and modifying Paper. for further information on building and modifying Paper.
=================================================== ===================================================
""".trimIndent() """.trimIndent()