From a71b8657f1efb1e9717dff5fb57da42a206b25f5 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Sat, 25 Dec 2021 15:50:17 +0100 Subject: [PATCH 1/4] Update Contributing file --- .github/CONTRIBUTING.md | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 21412d2..0ada0b9 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -2,7 +2,8 @@ [discord]: https://helpch.at/discord [code of conduct]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/CODE_OF_CONDUCT.md [wiki]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/docs/wiki/wiki -[dev]: https://github.com/PlaceholderAPI/PlaceholderAPI/tree/development +[master]: https://github.com/PlaceholderAPI/PlaceholderAPI/tree/master +[docs-wiki]: https://github.com/PlaceholderAPI/PlaceholderAPI/tree/docs/wiki [style]: https://github.com/PlaceholderAPI/PlaceholderAPI/tree/master/config/style # Contributing Guidelines @@ -37,15 +38,33 @@ PlaceholderAPI provides a feature to have expansions (separate jar files) for pl In those cases should you report the issue to the issue tracker of the expansion or plugin. ## Pull requests -As an open source project are we welcoming all contributions to improve PlaceholderAPI, being it changes to its code like bug fixes or new features, or contributions to its documentation such as the [Wiki] or the Javadoc. +As an open source project are we welcoming all contributions to improve PlaceholderAPI, being it changes to its code, or contributions to its documentation such as the [Wiki] or the Javadocs. + +**When contributing, make sure to both base of and target the mentioned branch. Pull requests targeting the wrong branch may get closed without a warning.** ### Code contributions +> **Source and Target Branch:** [`master`][master] + +When contributing towards the code of PlaceholderAPI, be it new features or just bug fixes, should your changes follow the general code styling used in the project. +You can find the necessary files in the [`config/style`][style] directory of this repository. + Any contributions to PlaceholderAPI's code should be done towards the [`development`][dev] branch. Targeting the `master` branch in your Pull request may get it closed without warning. Additionally should you follow the project's codestyle which you can find in the [`config/style`][style] directory. -### Wiki/Javadoc contributions -If your pull request only targets the [wiki] or only changes the javadoc comments of PlaceholderAPI (And not its actual code), it should be to `docs/wiki` branch. -The develop branch should only be targeted when you also change some of PlaceholderAPI's code. +### Javadocs contributions +> **Source and Target Branch:** [`master`][master]* + +Javadocs changes should usually be combined with [code contributions](#code-contributions) when possible, but if not, make sure the changes are significant enough to warrant a new build on our CI server. + +\*This branch may change in the future. + +### Wiki contributions +> **Source and Target Branch:** [`docs/wiki`][docs-wiki] + +The Wiki of PlaceholderAPI has a unique quirk by having a dedicated [`wiki` folder][wiki] hosting the pages found on the actual wiki itself. +If you find outdated information, want to add missing expansions/plugins or just like to correct some wrong spelling should you both base of and target your contributions on the `docs/wiki` branch. + +**Please only PR changes for the `wiki` folder on the `docs/wiki` branch! Pull requests not following this guidelines will be closed unnanounced.** ## Code of Conduct We have a [Code of Conduct] to maintain a welcoming atmosphere in this project. From 38e6e02e1b30370fb72cd882d535d3d5d0e44fbe Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Sat, 25 Dec 2021 15:53:07 +0100 Subject: [PATCH 2/4] Not sure how I missed that... --- .github/CONTRIBUTING.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 0ada0b9..bfe054d 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -48,9 +48,6 @@ As an open source project are we welcoming all contributions to improve Placehol When contributing towards the code of PlaceholderAPI, be it new features or just bug fixes, should your changes follow the general code styling used in the project. You can find the necessary files in the [`config/style`][style] directory of this repository. -Any contributions to PlaceholderAPI's code should be done towards the [`development`][dev] branch. Targeting the `master` branch in your Pull request may get it closed without warning. -Additionally should you follow the project's codestyle which you can find in the [`config/style`][style] directory. - ### Javadocs contributions > **Source and Target Branch:** [`master`][master]* From 69fd180c9bb828190078a87e6d90a752d42437ec Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Sat, 25 Dec 2021 16:55:05 +0100 Subject: [PATCH 3/4] Update CONTRIBUTING.md --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index bfe054d..11e2923 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -45,7 +45,7 @@ As an open source project are we welcoming all contributions to improve Placehol ### Code contributions > **Source and Target Branch:** [`master`][master] -When contributing towards the code of PlaceholderAPI, be it new features or just bug fixes, should your changes follow the general code styling used in the project. +When contributing towards the code of PlaceholderAPI, be it new features or just bug fixes, your changes should follow the general code styling used in the project. You can find the necessary files in the [`config/style`][style] directory of this repository. ### Javadocs contributions From 3bc6ad0f06a1619bed4b1d6d6b3e8f8faeb0bfb9 Mon Sep 17 00:00:00 2001 From: Andre_601 Date: Sat, 12 Mar 2022 01:20:21 +0100 Subject: [PATCH 4/4] Also update label-commenter-config --- .github/label-commenter-config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/label-commenter-config.yml b/.github/label-commenter-config.yml index 03fe45e..603bf63 100644 --- a/.github/label-commenter-config.yml +++ b/.github/label-commenter-config.yml @@ -71,7 +71,7 @@ labels: Here is a small summary of what you should know: - - Pull requests for PlaceholderAPI should target the `development` branch. + - Pull requests for PlaceholderAPI should target the `master` branch. - Pull requests for the Wiki should target the `docs/wiki` branch. Don't hesitate to ask us any questions.