From 0c540cf903fe275ec0837bf1ac85122f41b46f0a Mon Sep 17 00:00:00 2001 From: Hawk Date: Wed, 13 May 2020 21:41:04 +0200 Subject: [PATCH] test10 --- Jenkinsfile | 2 +- jenkins/buildFrontend.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8d07d91..9b767f7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,7 +15,7 @@ pipeline { steps { sh 'echo $BRANCH_NAME' script{ - def SCRIPT_OUTPUT = sh (script: 'sudo bash ./jenkins/buildFrontend.sh',returnStdout: true).trim() + def SCRIPT_OUTPUT = sh (script: 'sudo bash ./jenkins/buildFrontend.sh',returnStdout: true) echo "Script Output: ${SCRIPT_OUTPUT}" } } diff --git a/jenkins/buildFrontend.sh b/jenkins/buildFrontend.sh index 4780e89..69a6462 100644 --- a/jenkins/buildFrontend.sh +++ b/jenkins/buildFrontend.sh @@ -1,7 +1,7 @@ #!/usr/bin/env sh -cd ./frontend -echo "$BRANCH_NAME" +cd ./Frontend + if test "$BRANCH_NAME" = "edit-jenkinsfile" then echo 'Install neccessary Packages' @@ -9,5 +9,5 @@ then echo 'Build Frontend for Production' yarn run build else - echo 'Not in master branch' + echo "$BRANCH_NAME" fi