From 4574a4e478ddefe9c129c59c70f4ce6824b584e8 Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@mcgalaxy.de>
Date: Thu, 1 Nov 2018 16:42:08 +0100
Subject: [PATCH] Updated Jenkinsfile

---
 Jenkinsfile | 266 ++++++++++++++++++++++++++--------------------------
 1 file changed, 133 insertions(+), 133 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 21edf47..2f72dd8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,158 +6,158 @@ pipeline {
        booleanParam(defaultValue: true, description: 'Build the libraries as well', name: 'build_libraries')
        booleanParam(defaultValue: true, description: 'Deploy this build', name: 'deploy_build')
     }
+
+	environment {
+		//General flags
+		CXX_FLAGS = ''
+		C_FLAGS = ''
+
+		//CMake specific flags
+		CMAKE_OPTIONS = ''
+		CMAKE_MAKE_OPTIONS = '-j 12'
+
+		//Make specific flags
+		MAKE_OPTIONS = '-j 12'
+	}
 	
-	stages {
-		stage ('build') {
-			parallel {
-				stage ('x86') {
-					agent {
-						label 'linux && x84 && teaspeak'
+	//stages {
+	//	stage ('build') {
+	parallel {
+		stage ('Build x86') {
+			agent {
+				label 'linux && x84 && teaspeak'
+			}
+
+			stages {
+				stage ('Initialize libraries') {
+					when {
+						expression { params.build_libraries }
 					}
 
-					environment {
-						//General flags
-						CXX_FLAGS = ''
-						C_FLAGS = ''
-
-						//CMake specific flags
-						CMAKE_OPTIONS = ''
-						CMAKE_MAKE_OPTIONS = '-j 12'
-
-						//Make specific flags
-						MAKE_OPTIONS = '-j 12'
-					}
-
-
-					stages {
-						stage ('Initialize libraries') {
-							when {
-								expression { params.build_libraries }
-							}
-							
-							steps {
-								sh 'apt-get update'
-								sh 'git reset --hard origin/master; git submodule update --init --remote --recursive --force'
-								sh 'git submodule update --merge'
-								sh './attach_modules.sh'
-								sh 'cd libraries; ./build.sh'
-							}
-						}
-						
-						
-						stage ('Build TeaSpeak Debug') {
-							environment {
-								TEASPEAK_BUILD_TYPE="Debug"
-							}
-
-							stages {
-								stage ('build') {
-									steps {
-										sh './build_teaspeak.sh'
-									}
-								}
-								stage ('deploy') {
-									when {
-										expression { params.deploy_build }
-									}
-									steps {
-										sh 'cd TeaSpeak/server/repro/; chmod 400 build_private_key; ./build.sh linux/x86'
-									}
-								}
-							}
-						}
+					steps {
+						sh 'apt-get update'
+						sh 'git reset --hard origin/master; git submodule update --init --remote --recursive --force'
+						sh 'git submodule update --merge'
+						sh './attach_modules.sh'
+						sh 'cd libraries; ./build.sh'
 					}
 				}
 
-				stage ('amd64') {
-					agent {
-						label 'linux && amd64 && teaspeak'
-					}
 
+				stage ('Build TeaSpeak Debug') {
 					environment {
-						//General flags
-						CXX_FLAGS = ''
-						C_FLAGS = ''
-
-						//CMake specific flags
-						CMAKE_OPTIONS = ''
-						CMAKE_MAKE_OPTIONS = '-j 12'
-
-						//Make specific flags
-						MAKE_OPTIONS = '-j 12'
+						TEASPEAK_BUILD_TYPE="Debug"
 					}
 
-
 					stages {
-						stage ('Initialize libraries') {
-							when {
-								expression { params.build_libraries }
-							}
-							
+						stage ('build') {
 							steps {
-								sh 'apt-get update'
-								sh 'git reset --hard origin/master; git submodule update --init --remote --recursive --force'
-								sh 'git submodule update --merge'
-								sh './attach_modules.sh'
-								sh 'cd libraries; ./build.sh'
-
+								sh './build_teaspeak.sh'
 							}
 						}
-						
-						stage ('Build TeaSpeak') {
-							parallel {
-								stage ('Build TeaSpeak Debug') {
-									environment {
-										TEASPEAK_BUILD_TYPE="Debug"
-									}
-
-									stages {
-										stage ('build') {
-											steps {
-												sh './build_teaspeak.sh'
-											}
-										}
-										stage ('deploy') {
-											when {
-												expression { params.deploy_build }
-											}
-											steps {
-												sh 'cd TeaSpeak/server/repro/; chmod 400 build_private_key; ./build.sh linux/amd64'
-											}
-										}
-									}
-								}
-
-								stage ('Build TeaSpeak Release') {
-									when {
-										expression { params.build_optimized }
-									}
-
-									environment {
-										TEASPEAK_BUILD_TYPE="Release"
-									}
-
-									stages {
-										stage ('build') {
-											steps {
-												sh './build_teaspeak.sh'
-											}
-										}
-										stage ('deploy') {
-											when {
-												expression { params.deploy_build == true }
-											}
-											steps {
-												sh 'cd TeaSpeak/server/repro/; chmod 400 build_private_key; ./build.sh linux/amd64_optimized'
-											}
-										}
-									}
-								}
+						stage ('deploy') {
+							when {
+								expression { params.deploy_build }
+							}
+							steps {
+								sh 'cd TeaSpeak/server/repro/; chmod 400 build_private_key; ./build.sh linux/x86'
 							}
 						}
 					}
 				}
 			}
 		}
+		
+		stage ('Build amd64 Debug') {
+			agent {
+				label 'linux && amd64 && teaspeak'
+			}
+
+			stages {
+				stage ('Initialize libraries') {
+					when {
+						expression { params.build_libraries }
+					}
+
+					steps {
+						sh 'apt-get update'
+						sh 'git reset --hard origin/master; git submodule update --init --remote --recursive --force'
+						sh 'git submodule update --merge'
+						sh './attach_modules.sh'
+						sh 'cd libraries; ./build.sh'
+
+					}
+				}
+
+				stage ('Build') {
+					environment {
+						TEASPEAK_BUILD_TYPE="Debug"
+					}
+
+					steps {
+						sh './build_teaspeak.sh'
+					}
+				}
+				
+				stage ('Deploy') {
+					when {
+						expression { params.deploy_build }
+					}
+
+					steps {
+						sh 'cd TeaSpeak/server/repro/; chmod 400 build_private_key; ./build.sh linux/amd64'
+					}
+				}
+			}
+		}
+		
+		stage ('Build amd64 Release') {
+			when {
+				expression { params.build_optimized }
+			}
+					
+			agent {
+				label 'linux && amd64 && teaspeak'
+			}
+
+			stages {
+				stage ('Initialize libraries') {
+					when {
+						expression { params.build_libraries }
+					}
+
+					steps {
+						sh 'apt-get update'
+						sh 'git reset --hard origin/master; git submodule update --init --remote --recursive --force'
+						sh 'git submodule update --merge'
+						sh './attach_modules.sh'
+						sh 'cd libraries; ./build.sh'
+
+					}
+				}
+
+				stage ('Build') {
+					environment {
+						TEASPEAK_BUILD_TYPE="Release"
+					}
+
+					steps {
+						sh './build_teaspeak.sh'
+					}
+				}
+				
+				stage ('Deploy') {
+					when {
+						expression { params.deploy_build }
+					}
+
+					steps {
+						sh 'cd TeaSpeak/server/repro/; chmod 400 build_private_key; ./build.sh linux/amd64_optimized'
+					}
+				}
+			}
+		}
+			//}
+		//}
 	}
 }