Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/main/resources/plugin.yml
  • Loading branch information
RoinujNosde committed Dec 11, 2020
2 parents b1a183f + abc21cd commit f1e6844
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 2 deletions.
31 changes: 31 additions & 0 deletions .github/workflows/dev_build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# 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: Dev Build

on: push

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Install MassiveCore
run: mvn install:install-file "-Dfile=./repo/com/MassiveCraft/MassiveCore/2.14.0/MassiveCore-2.14.0.jar" "-DgroupId=com.MassiveCraft.MassiveCore" "-DartifactId=MassiveCore" "-Dversion=2.14.0" "-Dpackaging=jar" "-DgeneratePom=true"
- name: Install Factions
run: mvn install:install-file "-Dfile=./repo/com/MassiveCraft/Factions/2.14.0/Factions-2.14.0.jar" "-DgroupId=com.MassiveCraft.Factions" "-DartifactId=Factions" "-Dversion=2.14.0" "-Dpackaging=jar" "-DgeneratePom=true"
- name: Build with Maven
run: mvn -B package --file pom.xml
- name: Create Staging
run: mkdir staging && cp target/TitansBattle*.jar staging
- name: Upload a Build Artifact
uses: actions/upload-artifact@v2
with:
name: TitansBattle
path: staging
6 changes: 5 additions & 1 deletion .github/workflows/publish-bintray.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ jobs:
server-id: bintray-roinujnosde-bukkit-plugins # Value of the distributionManagement/repository/id field of the pom.xml
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD

- name: Install MassiveCore
run: mvn install:install-file "-Dfile=./repo/com/MassiveCraft/MassiveCore/2.14.0/MassiveCore-2.14.0.jar" "-DgroupId=com.MassiveCraft.MassiveCore" "-DartifactId=MassiveCore" "-Dversion=2.14.0" "-Dpackaging=jar" "-DgeneratePom=true"
- name: Install Factions
run: mvn install:install-file "-Dfile=./repo/com/MassiveCraft/Factions/2.14.0/Factions-2.14.0.jar" "-DgroupId=com.MassiveCraft.Factions" "-DartifactId=Factions" "-Dversion=2.14.0" "-Dpackaging=jar" "-DgeneratePom=true"

- name: Build with Maven
run: mvn -B package --file pom.xml

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ permissions:
titansbattle.setinventory:
default: false
titansbattle.ranking:
default: false
default: false

0 comments on commit f1e6844

Please sign in to comment.