From 83763f200b1a2962e08fc345fba794a3d85e7312 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Tue, 25 Jul 2017 01:10:27 +0200
Subject: [PATCH] Fixing build for numerics
---
Jenkinsfile_numerics | 4 ++--
build.sh | 13 +++++++------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Jenkinsfile_numerics b/Jenkinsfile_numerics
index c4c224ccb..ee201dfc1 100644
--- a/Jenkinsfile_numerics
+++ b/Jenkinsfile_numerics
@@ -9,7 +9,7 @@ parallel (
checkout scm
stage ('build_gin')
{
- sh "./build_pdata.sh $WORKSPACE $NODE_NAME numerics"
+ sh "./build.sh $WORKSPACE $NODE_NAME numerics"
}
stage ('run_gin')
@@ -35,7 +35,7 @@ parallel (
checkout scm
stage ('build_sb15')
{
- sh "./build_pdata.sh $WORKSPACE $NODE_NAME numerics"
+ sh "./build.sh $WORKSPACE $NODE_NAME numerics"
}
stage ('run_sb15')
diff --git a/build.sh b/build.sh
index 45d87ae55..24a4d16fb 100755
--- a/build.sh
+++ b/build.sh
@@ -40,9 +40,10 @@ then
mv $HOME/openfpm_vars $HOME/openfpm_vars_$5
source $HOME/openfpm_vars_$5
elif [ x"$3" == x"numerics" ]; then
- CC=gcc-4.9.2 CXX=g++-4.9.2 FC=gfortran-4.9.2 F77=gfortran-4.9.2 ./install -i $HOME/$5 -m -s -c "--prefix=/home/jenkins/openfpm_install"
- mv $HOME/openfpm_vars $HOME/openfpm_vars_$5
- source $HOME/openfpm_vars_$5
+ branch=$(git ls-remote --heads origin | grep $(git rev-parse HEAD) | cut -d / -f 3)
+ CC=gcc-4.9.2 CXX=g++-4.9.2 FC=gfortran-4.9.2 F77=gfortran-4.9.2 ./install -i $HOME/$branch -m -s -c "--prefix=/home/jenkins/openfpm_install"
+ mv $HOME/openfpm_vars $HOME/openfpm_vars_$branch
+ source $HOME/openfpm_vars_$branch
make $3
else
CC=gcc-4.9.2 CXX=g++-4.9.2 FC=gfortran-4.9.2 F77=gfortran-4.9.2 ./install -i $HOME/$5 -m -s -c "--prefix=/home/jenkins/openfpm_install --no-recursion"
@@ -98,9 +99,9 @@ else
mv $HOME/openfpm_vars $HOME/openfpm_vars_$5
source $HOME/openfpm_vars_$5
elif [ x"$3" == x"numerics" ]; then
- ./install -i $HOME/$5 -m -s -c "--prefix=/home/jenkins/openfpm_install"
- mv $HOME/openfpm_vars $HOME/openfpm_vars_$5
- source $HOME/openfpm_vars_$5
+ branch=$(git ls-remote --heads origin | grep $(git rev-parse HEAD) | cut -d / -f 3)
+ ./install -i $HOME/$branch -m -s -c "--prefix=/home/jenkins/openfpm_install"
+ source $HOME/openfpm_vars_$branch
make $3
else
./install -i $HOME/$5 -m -s -c "--prefix=/Users/jenkins/openfpm_install --no-recursion"
--
GitLab