diff --git a/Jenkinsfile b/Jenkinsfile index fefe277..51b20c6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,17 @@ pipeline { stage("build") { steps { withGradle { - sh "./gradlew build javadoc publish --no-daemon" + sh "./gradlew build javadoc --no-daemon" + } + } + } + stage("publish") { + when { + branch "master" + } + steps { + withGradle { + sh "./gradlew publish --no-daemon" } } } @@ -12,11 +22,9 @@ pipeline { post { always { archiveArtifacts artifacts: "build/libs/*.jar", fingerprint: true - javadoc javadocDir "build/docs/javadoc" { - javadoc keepAll false - } + javadoc javadocDir: 'build/docs/javadoc', keepAll: false discordSend description: "Jenkins", link: env.BUILD_URL, result: currentBuild.currentResult, title: JOB_NAME, webhookURL: env.PLEX_WEBHOOK_URL - deleteWs() + cleanWs() } } } \ No newline at end of file diff --git a/src/main/java/dev/plex/util/UpdateChecker.java b/src/main/java/dev/plex/util/UpdateChecker.java index bafc58c..01da09d 100644 --- a/src/main/java/dev/plex/util/UpdateChecker.java +++ b/src/main/java/dev/plex/util/UpdateChecker.java @@ -137,20 +137,20 @@ public class UpdateChecker extends PlexBase public void updateJar() { CloseableHttpClient client = HttpClients.createDefault(); - HttpGet get = new HttpGet(DOWNLOAD_PAGE + "lastSuccessfulBuild/api/json"); + HttpGet get = new HttpGet(DOWNLOAD_PAGE + "job/master/lastSuccessfulBuild/api/json"); try { HttpResponse response = client.execute(get); JSONObject object = new JSONObject(EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8)); JSONObject artifact = object.getJSONArray("artifacts").getJSONObject(0); - String name = artifact.getString("displayPath"); + String name = artifact.getString("fileName"); PlexLog.log("Downloading latest Plex jar file: " + name); CompletableFuture.runAsync(() -> { try { FileUtils.copyURLToFile( - new URL(DOWNLOAD_PAGE + "lastSuccessfulBuild/artifact/build/libs/" + name), + new URL(DOWNLOAD_PAGE + "job/master/lastSuccessfulBuild/artifact/build/libs/" + name), new File(Bukkit.getUpdateFolderFile(), name) ); PlexLog.log("Saved new jar. Please restart your server.");