From 1a4fb5e8b7d48ccbc0bab285c555571376fb2c03 Mon Sep 17 00:00:00 2001 From: Hellohi3654 <57390764+Hellohi3654@users.noreply.github.com> Date: Wed, 3 Feb 2021 18:58:01 +1100 Subject: [PATCH 1/4] Add Workflow --- .github/workflows/Build Push and PR.yml | 36 +++++++++++++++++++++++++ common/pom.xml | 17 ++++++++++-- pom.xml | 5 ++-- 3 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/Build Push and PR.yml diff --git a/.github/workflows/Build Push and PR.yml b/.github/workflows/Build Push and PR.yml new file mode 100644 index 0000000..21d30e0 --- /dev/null +++ b/.github/workflows/Build Push and PR.yml @@ -0,0 +1,36 @@ +# This workflow will build a Java project with Maven +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: Build Push & PR + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - uses: actions/cache@v1 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Build with Maven + run: mvn -B -U package -T 2C + - name: Archive artifacts + uses: actions/upload-artifact@v2 + if: success() + with: + name: GeyserSkinManager + path: spigot/target/GeyserSkinManager-Spigot.jar diff --git a/common/pom.xml b/common/pom.xml index 322abfe..21f1004 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -8,13 +8,26 @@ 1.0-SNAPSHOT 4.0.0 + + + + opencollab-snapshot-repo + https://repo.opencollab.dev/maven-snapshots/ + + false + + + true + + + org.geysermc connector 1.2.0-SNAPSHOT - provided + compile com.fasterxml.jackson.datatype @@ -39,4 +52,4 @@ - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index 1d3daad..4363ebc 100644 --- a/pom.xml +++ b/pom.xml @@ -12,6 +12,5 @@ common spigot - - - \ No newline at end of file + + From f1d23bec56f77efd4c63672f40ec658815e0bf93 Mon Sep 17 00:00:00 2001 From: Zach Date: Thu, 4 Feb 2021 18:29:06 +1100 Subject: [PATCH 2/4] update fix workflow and pom --- ...h and PR.yml => Build without Release.yml} | 25 +++++++++++++------ common/pom.xml | 4 +-- pom.xml | 4 +-- 3 files changed, 22 insertions(+), 11 deletions(-) rename .github/workflows/{Build Push and PR.yml => Build without Release.yml} (57%) diff --git a/.github/workflows/Build Push and PR.yml b/.github/workflows/Build without Release.yml similarity index 57% rename from .github/workflows/Build Push and PR.yml rename to .github/workflows/Build without Release.yml index 21d30e0..42d230b 100644 --- a/.github/workflows/Build Push and PR.yml +++ b/.github/workflows/Build without Release.yml @@ -1,13 +1,18 @@ # This workflow will build a Java project with Maven # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven -name: Build Push & PR +name: Build without Release on: - push: - branches: [ master ] - pull_request: - branches: [ master ] + workflow_dispatch: + inputs: + name: + description: 'Build without Release' + required: true + default: 'Build' + home: + description: 'location' + required: false jobs: build: @@ -28,9 +33,15 @@ jobs: java-version: 1.8 - name: Build with Maven run: mvn -B -U package -T 2C - - name: Archive artifacts + - name: Archive artifacts (GeyserSM Spigot) uses: actions/upload-artifact@v2 if: success() with: - name: GeyserSkinManager + name: GeyserSkinManager (Spigot) path: spigot/target/GeyserSkinManager-Spigot.jar + - name: Archive artifacts (GeyserSM Bungee) + uses: actions/upload-artifact@v2 + if: success() + with: + name: GeyserSkinManager (Bungeecord) + path: spigot/target/GeyserSkinManager-Bungeecord.jar diff --git a/common/pom.xml b/common/pom.xml index 21f1004..77a0451 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ GeyserSkinManager com.github.camotoy - 1.0-SNAPSHOT + 1.1-SNAPSHOT 4.0.0 @@ -27,7 +27,7 @@ org.geysermc connector 1.2.0-SNAPSHOT - compile + provided com.fasterxml.jackson.datatype diff --git a/pom.xml b/pom.xml index 4363ebc..2f583cc 100644 --- a/pom.xml +++ b/pom.xml @@ -7,10 +7,10 @@ com.github.camotoy GeyserSkinManager pom - 1.0-SNAPSHOT + 1.1-SNAPSHOT + bungeecord common spigot - From 118e8ce7050bf4dd99665905e9d31b450be5232a Mon Sep 17 00:00:00 2001 From: Zach Date: Thu, 4 Feb 2021 18:33:36 +1100 Subject: [PATCH 3/4] Update Build without Release.yml --- .github/workflows/Build without Release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Build without Release.yml b/.github/workflows/Build without Release.yml index 42d230b..2929a20 100644 --- a/.github/workflows/Build without Release.yml +++ b/.github/workflows/Build without Release.yml @@ -44,4 +44,4 @@ jobs: if: success() with: name: GeyserSkinManager (Bungeecord) - path: spigot/target/GeyserSkinManager-Bungeecord.jar + path: bungeecord/target/GeyserSkinManager-Bungeecord.jar From a4d8ce35b5fe14ead2ab4e31b24fc209f6f31e2e Mon Sep 17 00:00:00 2001 From: Hellohi3654 <57390764+Hellohi3654@users.noreply.github.com> Date: Thu, 4 Feb 2021 23:00:28 +1100 Subject: [PATCH 4/4] Update Build without Release.yml --- .github/workflows/Build without Release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Build without Release.yml b/.github/workflows/Build without Release.yml index 2929a20..246f3c5 100644 --- a/.github/workflows/Build without Release.yml +++ b/.github/workflows/Build without Release.yml @@ -44,4 +44,4 @@ jobs: if: success() with: name: GeyserSkinManager (Bungeecord) - path: bungeecord/target/GeyserSkinManager-Bungeecord.jar + path: bungeecord/target/GeyserSkinManager-BungeeCord.jar