diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..6e75748 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,31 @@ +name: Deploy + +on: + push: + branches: + - master + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac + + - name: Set up JDK 1.8 + uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 + with: + java-version: 8 + distribution: temurin + + - uses: s4u/maven-settings-action@v2.8.0 + with: + servers: '[{"id": "opencollab-release-repo", "username": "${env.MAVEN_USERNAME}", "password": "${env.MAVEN_PASSWORD}"},{"id": "opencollab-snapshot-repo", "username": "${env.MAVEN_USERNAME}", "password": "${env.MAVEN_PASSWORD}"}]' + + - name: Deploy with Maven + run: mvn deploy -B -P deploy + env: + MAVEN_USERNAME: ${{ vars.DEPLOY_USER }} + MAVEN_PASSWORD: ${{ secrets.DEPLOY_PASS }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 73ac252..dd0908d 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -8,10 +8,14 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: Build with Maven - run: mvn package --file pom.xml + - name: Checkout repository + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac + + - name: Set up JDK 1.8 + uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 + with: + java-version: 8 + distribution: temurin + + - name: Build with Maven + run: mvn package --file pom.xml diff --git a/Jenkinsfile b/Jenkinsfile index c3093b7..e000a95 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,35 +18,5 @@ pipeline { } } } - - stage ('Deploy') { - when { - branch "master" - } - - steps { - rtMavenDeployer( - id: "maven-deployer", - serverId: "opencollab-artifactory", - releaseRepo: "maven-releases", - snapshotRepo: "maven-snapshots" - ) - rtMavenResolver( - id: "maven-resolver", - serverId: "opencollab-artifactory", - releaseRepo: "maven-deploy-release", - snapshotRepo: "maven-deploy-snapshot" - ) - rtMavenRun( - pom: 'pom.xml', - goals: 'javadoc:jar source:jar install -DskipTests', - deployerId: "maven-deployer", - resolverId: "maven-resolver" - ) - rtPublishBuildInfo( - serverId: "opencollab-artifactory" - ) - } - } } } \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8079025..73df1f8 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,6 @@ UTF-8 1.8 - @@ -38,6 +37,13 @@ Steveice10 Steveice10@gmail.com + + GeyserMC + GeyserMC + https://geysermc.org/ + GeyserMC + https://github.com/GeyserMC + @@ -126,4 +132,23 @@ + + + + deploy + + true + + + + opencollab-release-repo + https://repo.opencollab.dev/maven-releases/ + + + opencollab-snapshot-repo + https://repo.opencollab.dev/maven-snapshots/ + + + +