From c95cc735ff9b0f473523dc27c03c02c600a11b1d Mon Sep 17 00:00:00 2001 From: JackCarterSmith Date: Mon, 5 Nov 2018 14:38:51 +0100 Subject: [PATCH 01/13] Experimental CI --- Jenkinsfile | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..7ad5f1c --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,20 @@ +pipeline { + agent any + stages { + stage('Setup') { + steps { + sh './gradlew setupCIWorkspace' + } + } + stage('Compilation') { + steps { + sh './gradlew build' + } + } + stage('Release') { + steps { + echo 'Compilation done.' + } + } + } +} \ No newline at end of file From ff98608d49c656c1fdb7c3355190cdbcdb33840b Mon Sep 17 00:00:00 2001 From: JackCarterSmith Date: Mon, 5 Nov 2018 22:46:33 +0100 Subject: [PATCH 02/13] test #2 --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 7ad5f1c..6c664f1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,6 +3,7 @@ pipeline { stages { stage('Setup') { steps { + ws(dir: 'orbsat') sh './gradlew setupCIWorkspace' } } From 54cdbef779be04e73a7597a0497f5a36137bf9c9 Mon Sep 17 00:00:00 2001 From: JackCarterSmith Date: Tue, 6 Nov 2018 13:52:53 +0100 Subject: [PATCH 03/13] Added Jenkinsfile --- Jenkinsfile | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6c664f1..357d237 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,20 +1,29 @@ pipeline { - agent any + agent { + node { + label 'maître' + } + + } stages { stage('Setup') { steps { - ws(dir: 'orbsat') sh './gradlew setupCIWorkspace' } } - stage('Compilation') { + stage('Checking code') { + steps { + sh './gradlew check' + } + } + stage('Compile') { steps { sh './gradlew build' } } - stage('Release') { + stage('JAR release') { steps { - echo 'Compilation done.' + sh './gradlew jar' } } } From 4a6930bf488f7d990693f76f513b55ca9cb56afc Mon Sep 17 00:00:00 2001 From: JackCarterSmith Date: Tue, 6 Nov 2018 13:54:32 +0100 Subject: [PATCH 04/13] Added Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 357d237..b912232 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ pipeline { agent { node { - label 'maître' + label 'main' } } From baa657798d87cd70b6a585a5a8c149355be455f6 Mon Sep 17 00:00:00 2001 From: JackCarterSmith Date: Tue, 6 Nov 2018 14:15:12 +0100 Subject: [PATCH 05/13] Added Jenkinsfile --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b912232..b44978c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,9 @@ pipeline { stages { stage('Setup') { steps { - sh './gradlew setupCIWorkspace' + sh '''pwd +ls -la +./gradlew setupCIWorkspace''' } } stage('Checking code') { From 109eaae501aebcc75fecf430b69861a7b04ea72b Mon Sep 17 00:00:00 2001 From: JackCarterSmith Date: Tue, 6 Nov 2018 14:16:45 +0100 Subject: [PATCH 06/13] Added Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index b44978c..0e758a6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,6 +10,7 @@ pipeline { steps { sh '''pwd ls -la +chmod -R 777 . ./gradlew setupCIWorkspace''' } } From 388d673c86967b439c26c47bc8d64c3dc73139ee Mon Sep 17 00:00:00 2001 From: JackCarterSmith Date: Tue, 6 Nov 2018 14:42:12 +0100 Subject: [PATCH 07/13] Added Jenkinsfile --- Jenkinsfile | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0e758a6..f45a623 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,9 +8,7 @@ pipeline { stages { stage('Setup') { steps { - sh '''pwd -ls -la -chmod -R 777 . + sh '''chmod +x gradlew ./gradlew setupCIWorkspace''' } } @@ -25,9 +23,21 @@ chmod -R 777 . } } stage('JAR release') { - steps { - sh './gradlew jar' + parallel { + stage('JAR release') { + steps { + sh './gradlew jar' + } + } + stage('Test') { + steps { + sh './gradlew test' + } + } } } } + environment { + JAVA_HOME = '/usr/java/jre1.8.0_192' + } } \ No newline at end of file From 5dfcce73bcb46a6de7c142e5e8b583243fcf48f8 Mon Sep 17 00:00:00 2001 From: JackCarterSmith Date: Tue, 6 Nov 2018 14:45:17 +0100 Subject: [PATCH 08/13] Added Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f45a623..a67010f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,6 +38,6 @@ pipeline { } } environment { - JAVA_HOME = '/usr/java/jre1.8.0_192' + JAVA_HOME = '/usr/lib/jvm/java-8-openjdk-amd64' } } \ No newline at end of file From 6dee6bd8756d9d77338e19c14481ec689141c46f Mon Sep 17 00:00:00 2001 From: JackCarterSmith Date: Tue, 6 Nov 2018 14:52:14 +0100 Subject: [PATCH 09/13] Fixed code --- .../orbsat/common/CommonProxy.java | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/main/java/jackcartersmith/orbsat/common/CommonProxy.java b/src/main/java/jackcartersmith/orbsat/common/CommonProxy.java index 876151b..9d95d83 100644 --- a/src/main/java/jackcartersmith/orbsat/common/CommonProxy.java +++ b/src/main/java/jackcartersmith/orbsat/common/CommonProxy.java @@ -1,23 +1,7 @@ package jackcartersmith.orbsat.common; -import java.util.UUID; - -import javax.annotation.Nonnull; - -import com.mojang.authlib.GameProfile; - import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.SoundEvent; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import net.minecraftforge.common.property.IExtendedBlockState; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.network.IGuiHandler; public class CommonProxy implements IGuiHandler { @@ -53,6 +37,19 @@ public class CommonProxy implements IGuiHandler { { } + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + // TODO Auto-generated method stub + return null; + } + + /* public static void openGuiForTile(@Nonnull EntityPlayer player, @Nonnull T tile) { player.openGui(OrbitalSatellite.instance, tile.getGuiID(), tile.getWorld(), tile.getPos().getX(), tile.getPos().getY(), tile.getPos().getZ()); @@ -230,4 +227,5 @@ public class CommonProxy implements IGuiHandler { public void clearRenderCaches() { } + */ } From 90013f697b12133f1bbe6214a88207cf9c34b71d Mon Sep 17 00:00:00 2001 From: JackCarterSmith Date: Tue, 6 Nov 2018 15:06:44 +0100 Subject: [PATCH 10/13] Added Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index a67010f..ae2f1d0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,6 +27,7 @@ pipeline { stage('JAR release') { steps { sh './gradlew jar' + archiveArtifacts 'OrbitalSatellite-*.jar' } } stage('Test') { From f125468c9523fd5383be8536a1aa22a3829325fd Mon Sep 17 00:00:00 2001 From: JackCarterSmith Date: Tue, 6 Nov 2018 15:08:37 +0100 Subject: [PATCH 11/13] Added Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ae2f1d0..9e812a4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,7 +27,7 @@ pipeline { stage('JAR release') { steps { sh './gradlew jar' - archiveArtifacts 'OrbitalSatellite-*.jar' + archiveArtifacts(artifacts: 'build/libs/OrbitalSatellite-*.jar', excludes: 'build/libs/OrbitalSatellite-*-sources.jar') } } stage('Test') { From 7e13e80f86b855bec47bc254d42dc481ee14952c Mon Sep 17 00:00:00 2001 From: JackCarterSmith Date: Tue, 6 Nov 2018 15:17:05 +0100 Subject: [PATCH 12/13] Added Jenkinsfile --- Jenkinsfile | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9e812a4..ca8b3f9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,33 +8,28 @@ pipeline { stages { stage('Setup') { steps { - sh '''chmod +x gradlew -./gradlew setupCIWorkspace''' + sh 'chmod +x gradlew' + sh './gradlew setupCIWorkspace' } } - stage('Checking code') { + stage('Check') { steps { sh './gradlew check' } } stage('Compile') { steps { - sh './gradlew build' + node(label: 'main') { + sh './gradlew build' + } + } } stage('JAR release') { - parallel { - stage('JAR release') { - steps { - sh './gradlew jar' - archiveArtifacts(artifacts: 'build/libs/OrbitalSatellite-*.jar', excludes: 'build/libs/OrbitalSatellite-*-sources.jar') - } - } - stage('Test') { - steps { - sh './gradlew test' - } - } + 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) } } } From 1e36d67c02843c242f1881b92e4612aaffc8f4a3 Mon Sep 17 00:00:00 2001 From: JackCarterSmith Date: Tue, 6 Nov 2018 15:20:36 +0100 Subject: [PATCH 13/13] Added Jenkinsfile --- Jenkinsfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ca8b3f9..b3efa30 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,10 +19,8 @@ pipeline { } stage('Compile') { steps { - node(label: 'main') { - sh './gradlew build' - } - + sh '''./gradlew clean +./gradlew build''' } } stage('JAR release') {