From: Augustin Degomme Date: Thu, 22 Nov 2018 14:24:02 +0000 (+0100) Subject: yet another attempt at a trivial thing. X-Git-Tag: v3_22~785 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/526e094c142ad15d369e01bc330e2d4fd8e62723?ds=sidebyside yet another attempt at a trivial thing. --- diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh index 916284189c..b19a0555cc 100755 --- a/tools/jenkins/build.sh +++ b/tools/jenkins/build.sh @@ -125,6 +125,13 @@ case "$build_mode" in ;; esac +if [ "$2" = "" ]; then + branch_name="unknown" +else + branch_name="$2" +fi +echo "Branch built is $branch_name" + NUMBER_OF_PROCESSORS="$(nproc)" || NUMBER_OF_PROCESSORS=1 GENERATOR="Unix Makefiles" @@ -210,7 +217,7 @@ if [ -f Testing/TAG ] ; then mv CTestResults.xml $WORKSPACE fi -if test -n "$INSTALL" && [ ${BRANCH_NAME} = "master" ] ; then +if test -n "$INSTALL" && [ ${branch_name} = "master" ] ; then echo "XX" echo "XX Test done. Install everything since it's a regular build, not on a Windows." echo "XX"