A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add python coverage
[simgrid.git]
/
tools
/
jenkins
/
build.sh
diff --git
a/tools/jenkins/build.sh
b/tools/jenkins/build.sh
index
9162841
..
59bbf3a
100755
(executable)
--- a/
tools/jenkins/build.sh
+++ b/
tools/jenkins/build.sh
@@
-125,6
+125,13
@@
case "$build_mode" in
;;
esac
;;
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"
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
mv CTestResults.xml $WORKSPACE
fi
-if test -n "$INSTALL" && [ ${
BRANCH_NAME} = "
master" ] ; then
+if test -n "$INSTALL" && [ ${
branch_name} = "origin/
master" ] ; then
echo "XX"
echo "XX Test done. Install everything since it's a regular build, not on a Windows."
echo "XX"
echo "XX"
echo "XX Test done. Install everything since it's a regular build, not on a Windows."
echo "XX"