diff --git a/Jenkinsfile b/Jenkinsfile index efc1da7d4..2c5b64457 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,8 +6,8 @@ pipeline { } agent { docker { - image 'gradlewrapper:latest' - args '-v gradlecache:/gradlecache' + image 'gradle:jdk8' + args '-v forgegc:/home/gradle/.gradle/' } } environment { @@ -18,13 +18,6 @@ pipeline { } stages { - /* This resets the checkout on jenkins, but doesn't take branch into account... - stage('fetch') { - steps { - checkout scm - } - } - */ stage('notify_start') { when { not { @@ -93,9 +86,7 @@ pipeline { always { script { archiveArtifacts artifacts: 'projects/forge/build/libs/**/*.*', fingerprint: true, onlyIfSuccessful: true, allowEmptyArchive: true - //junit 'build/test-results/*/*.xml' - //jacoco sourcePattern: '**/src/*/java' - + if (env.CHANGE_ID == null) { // This is unset for non-PRs discordSend( title: "${DISCORD_PREFIX} Finished ${currentBuild.currentResult}", diff --git a/build.gradle b/build.gradle index 6da907300..f5051d78c 100644 --- a/build.gradle +++ b/build.gradle @@ -431,11 +431,11 @@ project(':forge') { installer 'org.ow2.asm:asm:7.2' installer 'org.ow2.asm:asm-commons:7.2' installer 'org.ow2.asm:asm-tree:7.2' - installer 'cpw.mods:modlauncher:5.0.+' - installer 'cpw.mods:grossjava9hacks:1.1.+' - installer 'net.minecraftforge:accesstransformers:2.0.+:shadowed' - installer 'net.minecraftforge:eventbus:2.0.+:service' - installer 'net.minecraftforge:forgespi:2.0.+' + installer 'cpw.mods:modlauncher:5.1.+' + installer 'cpw.mods:grossjava9hacks:1.3.+' + installer 'net.minecraftforge:accesstransformers:2.1.+:shadowed' + installer 'net.minecraftforge:eventbus:2.1.+:service' + installer 'net.minecraftforge:forgespi:2.1.+' installer 'net.minecraftforge:coremods:2.0.+' installer 'net.minecraftforge:unsafe:0.2.+' installer 'com.electronwill.night-config:core:3.6.2'