From d2776eed5a4e93c5af2b84a8a82badaecc88e022 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Fri, 8 Oct 2021 18:09:58 +0200 Subject: [PATCH] [ci skip] Move to work level templates --- .github/FUNDING.yml | 12 ------------ .github/PULL_REQUEST_TEMPLATE.md | 18 ------------------ .github/release-drafter.yml | 21 +-------------------- .github/workflows/build.yml | 6 +++--- CONTRIBUTING.md | 13 ------------- README.md | 10 +--------- SECURITY.md | 3 --- 7 files changed, 5 insertions(+), 78 deletions(-) delete mode 100644 .github/FUNDING.yml delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md delete mode 100644 CONTRIBUTING.md delete mode 100644 SECURITY.md diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 67079dc67..000000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,12 +0,0 @@ -# These are supported funding model platforms - -github: [NotMyFault, dordsor21, SirYwell] -patreon: IntellectualSites # Replace with a single Patreon username -open_collective: IntellectualSites -ko_fi: # Replace with a single Ko-fi username -tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel -community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry -liberapay: # Replace with a single Liberapay username -issuehunt: # Replace with a single IssueHunt username -otechie: # Replace with a single Otechie username -custom: https://www.paypal.me/AlexanderBrandes # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 8e199ecb2..000000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,18 +0,0 @@ -## Overview - - -Fixes #{issue number} - -## Description - -## Checklist - -- [] Make sure you are opening from a **topic/feature/bugfix branch** (right side) and not your main branch. -- [] I tested my changes and approved their functionality -- [] I ensured my changes do not break other parts of the code -- [] I read and followed the [contribution guidelines](https://github.com/IntellectualSites/PlotSquared/blob/v6/CONTRIBUTING.md) -- [] Ensure that the pull request title represents the desired changelog entry diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index b2b5e9280..0d0b1c994 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,20 +1 @@ -categories: - - title: '🐛 Fixes' - label: 'Bugfix' - - title: '✨ Features' - label: 'Feature' - - title: '🧭 Changes' - label: 'Enhancement' - - title: '📦 Dependency updates' - labels: - - 'Renovate' - - 'Dependency updates' -change-template: '- $TITLE @$AUTHOR (#$NUMBER)' -change-title-escapes: '\<*_&@' -exclude-contributors: - - 'renovate' - - 'renovate-bot' -template: | - ## PlotSquared v6. - - $CHANGES +_extends: .github diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e5c29acea..764d5340a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,11 +10,11 @@ jobs: uses: "actions/checkout@v2.3.4" - name: "Validate Gradle Wrapper" uses: "gradle/wrapper-validation-action@v1.0.4" - - name: "Setup JDK 16" - uses: "actions/setup-java@v2.2.0" + - name: "Setup Java" + uses: "actions/setup-java@v2.3.1" with: distribution: "temurin" - java-version: "16" + java-version: "17" - name: "Clean Build" run: "./gradlew clean build" - name: "Determine release status" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index a049a8432..000000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,13 +0,0 @@ -# Contributing -If you feel like you can improve the plugin any way, then you are more than welcome to contribute to PlotSquared. It would be highly appreciated if you made sure to test your code before committing it, as it will save us a lot of time and effort. - -### Code Style -If you are planning to commit any changes to the project, it would be highly appreciated if you were to follow the project -code style conventions. To make this easier we have provided settings that can be picked up by your IDE. - -IntelliJ: Install the `EditorConfig` plugin. Now IntelliJ is able to pick up the provided `.editorconfig` file automatically. - -### Committing - -We are using [conventional commits](https://www.conventionalcommits.org/en/) to make commit messages more descriptive and -generate changelogs based on them. diff --git a/README.md b/README.md index 326786834..375a845c7 100644 --- a/README.md +++ b/README.md @@ -30,21 +30,13 @@ is to provide a lag-free and smooth experience. * [Wiki](https://github.com/IntellectualSites/PlotSquared-Documentation/wiki) * [Issues](https://github.com/IntellectualSites/PlotSquared/issues) * [Translations](https://intellectualsites.crowdin.com/plotsquared/) +* [Contributing](https://github.com/IntellectualSites/.github/blob/main/CONTRIBUTING.md) ### Developer Resources * [API Documentation](https://github.com/IntellectualSites/PlotSquared-Documentation/wiki/API-Documentation) * [Event API](https://github.com/IntellectualSites/PlotSquared-Documentation/wiki/Events) * [Flag API](https://github.com/IntellectualSites/PlotSquared-Documentation/wiki/API-Flag) -# Building -Gradle is the **recommended** way to build the project. Use `./gradlew build` in the main project directory to build the project. Gradle is required if you intend to build or develop the Sponge module. - -# Contributing -See [here](https://github.com/IntellectualSites/PlotSquared/blob/v6/CONTRIBUTING.md) - -## Suggestions -Suggestions are welcome! We have a separate issue tracker for suggestions, that can be found in [this](https://github.com/IntellectualSites/PlotSquaredSuggestions) repository. - # Official Addons * [Plot2Dynmap](http://www.spigotmc.org/resources/plot2dynmap.1292/) * [HoloPlots](https://www.spigotmc.org/resources/holoplots.4880/) diff --git a/SECURITY.md b/SECURITY.md deleted file mode 100644 index eced067c5..000000000 --- a/SECURITY.md +++ /dev/null @@ -1,3 +0,0 @@ -If you discover a security vulnerability in PlotSquared, please submit it through the [Security Vulnerability Form](https://forms.gle/btgdRn9yhGtzEiGW8). - -Thanks for helping make PlotSquared safe for everyone.