From 4348bb630430c3adf77832b979e3a552449db6a5 Mon Sep 17 00:00:00 2001 From: JackCarterSmith Date: Thu, 15 Nov 2018 14:08:50 +0100 Subject: [PATCH 1/3] Container compilation --- Jenkinsfile | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b3efa30..53b750f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ pipeline { agent { - node { - label 'main' + docker { + image 'jackcartersmith/gradle_mc:stable' } } @@ -12,26 +12,18 @@ pipeline { sh './gradlew setupCIWorkspace' } } - stage('Check') { - steps { - sh './gradlew check' - } - } stage('Compile') { steps { - sh '''./gradlew clean -./gradlew build''' + sh './gradlew clean' + sh './gradlew check' + sh './gradlew build' } } stage('JAR release') { steps { - sh './gradlew jar' archiveArtifacts(artifacts: 'build/libs/OrbitalSatellite-*.jar', excludes: 'build/libs/OrbitalSatellite-*-sources.jar') cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, cleanupMatrixParent: true, deleteDirs: true) } } } - environment { - JAVA_HOME = '/usr/lib/jvm/java-8-openjdk-amd64' - } } \ No newline at end of file From 4624961c907411d283afbcf2f68c0800d102de38 Mon Sep 17 00:00:00 2001 From: JackCarterSmith Date: Thu, 15 Nov 2018 14:43:13 +0100 Subject: [PATCH 2/3] Docker with signJar function --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 53b750f..12839ac 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,6 +2,7 @@ pipeline { agent { docker { image 'jackcartersmith/gradle_mc:stable' + args '-v /var/lib/jenkins/.gradle:/root/.gradle' } } From 5a80fd1ae3ba1b40a0d6d9965f76e9be2115c8eb Mon Sep 17 00:00:00 2001 From: JackCarterSmith Date: Tue, 26 Feb 2019 13:44:32 +0100 Subject: [PATCH 3/3] Remove useless file and fix albeno maven repo --- Jenkinsfile | 30 ------------------------------ build.gradle | 2 +- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 12839ac..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,30 +0,0 @@ -pipeline { - agent { - docker { - image 'jackcartersmith/gradle_mc:stable' - args '-v /var/lib/jenkins/.gradle:/root/.gradle' - } - - } - stages { - stage('Setup') { - steps { - sh 'chmod +x gradlew' - sh './gradlew setupCIWorkspace' - } - } - stage('Compile') { - steps { - sh './gradlew clean' - sh './gradlew check' - sh './gradlew build' - } - } - stage('JAR release') { - steps { - archiveArtifacts(artifacts: 'build/libs/OrbitalSatellite-*.jar', excludes: 'build/libs/OrbitalSatellite-*-sources.jar') - cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, cleanupMatrixParent: true, deleteDirs: true) - } - } - } -} \ No newline at end of file diff --git a/build.gradle b/build.gradle index da98ac3..b1a9480 100644 --- a/build.gradle +++ b/build.gradle @@ -98,7 +98,7 @@ dependencies { compileOnly "mcp.mobius.waila:Hwyla:1.8.20-B35_1.12" compileOnly 'industrial-craft:industrialcraft-2:release:ex112'//'net.industrial-craft:industrialcraft-2:2.8.+' compileOnly 'baubles:Baubles:1.12:1.5.2' - deobfCompile 'elucent:albedo:2.0-SNAPSHOT' + deobfCompile "albedo:albedo:0.1.3" }