From 07ff4054e9bb9ed6e621ba51fdd3e1f637605f00 Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Wed, 2 Aug 2017 16:36:12 +0200 Subject: [PATCH] Fall back properly if the build env for a specific branch does not exist Otherwise we will always need to create branches for cura-build-environment. In addition, we can now create build-specific branches if needed. --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7b45eafdf5..f7c43dd8bd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,7 +15,7 @@ parallel_nodes(['linux && cura', 'windows && cura']) { // Perform the "build". Since Uranium is Python code, this basically only ensures CMake is setup. stage('Build') { def branch = env.BRANCH_NAME - if(!(branch =~ /^2.\d+$/)) { + if(branch != "master" && !fileExists("${env.CURA_ENVIRONMENT_PATH}/${branch})) { branch = "master" }