From 7a4a0f13a2547b37b1eab2a9ecfc1f95a3426a37 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 23 Apr 2018 22:28:14 +0200 Subject: [PATCH] jenkins: save SIMGRID_VERSION as a variable, so that it's usable from every directories --- tools/jenkins/build.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh index 25a7613290..0bad846ad9 100755 --- a/tools/jenkins/build.sh +++ b/tools/jenkins/build.sh @@ -98,16 +98,17 @@ echo "XX" cmake -G"$GENERATOR" -Denable_documentation=OFF $WORKSPACE make dist -j$NUMBER_OF_PROCESSORS +SIMGRID_VERSION=$(cat VERSION) echo "XX" echo "XX Open the resulting archive" echo "XX" -gunzip $(cat VERSION).tar.gz -tar xf $(cat VERSION).tar -cd $(cat VERSION) +gunzip ${SIMGRID_VERSION}.tar.gz +tar xf ${SIMGRID_VERSION}.tar +cd ${SIMGRID_VERSION} mkdir build cd build -SRCFOLDER=".." +SRCFOLDER="${WORKSPACE}/build/${SIMGRID_VERSION}" echo "XX" echo "XX Configure and build SimGrid" @@ -136,8 +137,6 @@ set +x make -j$NUMBER_OF_PROCESSORS VERBOSE=1 -cd $WORKSPACE/build/$(cat VERSION)/build - echo "XX" echo "XX Run the tests" echo "XX pwd: "$(pwd) -- 2.20.1