keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Update jenkinsfile and gradle for new versions of things.. 

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
This commit is contained in:
cpw 2020-04-25 17:54:50 -04:00
parent 03c2a3d3a8
commit 4af0bfd661
No known key found for this signature in database
GPG Key ID: 8EB3DF749553B1B7
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Jenkinsfile vendored
View File

@ -6,8 +6,8 @@ pipeline {
} }
agent { agent {
docker { docker {
image 'gradlewrapper:latest' image 'gradle:jdk8'
args '-v gradlecache:/gradlecache' args '-v forgegc:/home/gradle/.gradle/'
} }
} }
environment { environment {
@ -18,13 +18,6 @@ pipeline {
} }
stages { stages {
/* This resets the checkout on jenkins, but doesn't take branch into account...
stage('fetch') {
steps {
checkout scm
}
}
*/
stage('notify_start') { stage('notify_start') {
when { when {
not { not {
@ -93,9 +86,7 @@ pipeline {
always { always {
script { script {
archiveArtifacts artifacts: 'projects/forge/build/libs/**/*.*', fingerprint: true, onlyIfSuccessful: true, allowEmptyArchive: true 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 if (env.CHANGE_ID == null) { // This is unset for non-PRs
discordSend( discordSend(
title: "${DISCORD_PREFIX} Finished ${currentBuild.currentResult}", title: "${DISCORD_PREFIX} Finished ${currentBuild.currentResult}",

10
build.gradle
View File

@ -431,11 +431,11 @@ project(':forge') {
installer 'org.ow2.asm:asm:7.2' installer 'org.ow2.asm:asm:7.2'
installer 'org.ow2.asm:asm-commons:7.2' installer 'org.ow2.asm:asm-commons:7.2'
installer 'org.ow2.asm:asm-tree:7.2' installer 'org.ow2.asm:asm-tree:7.2'
installer 'cpw.mods:modlauncher:5.0.+' installer 'cpw.mods:modlauncher:5.1.+'
installer 'cpw.mods:grossjava9hacks:1.1.+' installer 'cpw.mods:grossjava9hacks:1.3.+'
installer 'net.minecraftforge:accesstransformers:2.0.+:shadowed' installer 'net.minecraftforge:accesstransformers:2.1.+:shadowed'
installer 'net.minecraftforge:eventbus:2.0.+:service' installer 'net.minecraftforge:eventbus:2.1.+:service'
installer 'net.minecraftforge:forgespi:2.0.+' installer 'net.minecraftforge:forgespi:2.1.+'
installer 'net.minecraftforge:coremods:2.0.+' installer 'net.minecraftforge:coremods:2.0.+'
installer 'net.minecraftforge:unsafe:0.2.+' installer 'net.minecraftforge:unsafe:0.2.+'
installer 'com.electronwill.night-config:core:3.6.2' installer 'com.electronwill.night-config:core:3.6.2'