From 331b50ab10967e6200d4d8333a3251fa0822c25a Mon Sep 17 00:00:00 2001 From: Yannick Lamprecht Date: Sat, 21 Aug 2021 22:04:00 +0200 Subject: [PATCH] manual stuff --- .github/pull.yml | 7 +++++++ .github/workflows/build.yml | 4 ++++ 2 files changed, 11 insertions(+) create mode 100644 .github/pull.yml diff --git a/.github/pull.yml b/.github/pull.yml new file mode 100644 index 0000000000..a636fc3cfd --- /dev/null +++ b/.github/pull.yml @@ -0,0 +1,7 @@ +version: "1" +rules: # Array of rules + - base: v6 # Required. Target branch + upstream: IntellectualSites:v6 # Required. Must be in the same fork network. + mergeMethod: rebase # Optional, one of [none, merge, squash, rebase, hardreset], Default: none. + mergeUnstable: false # Optional, merge pull request even when the mergeable_state is not clean. Default: false +label: ":arrow_heading_down: pull" # Optional diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 764d5340af..20b2e84528 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,3 +39,7 @@ jobs: env: ORG_GRADLE_PROJECT_sonatypeUsername: "${{ secrets.SONATYPE_USERNAME }}" ORG_GRADLE_PROJECT_sonatypePassword: "${{ secrets.SONATYPE_PASSWORD }}" + - uses: "actions/upload-artifact@v2-preview" + with: + name: "PlotSquared" + path: "target/PlotSquared-Bukkit-*.jar"