error in DAMASK_env.sh seems to be the reason
This commit is contained in:
parent
50b3523927
commit
11a3d9c333
|
@ -20,7 +20,7 @@ stages:
|
||||||
|
|
||||||
###################################################################################################
|
###################################################################################################
|
||||||
before_script:
|
before_script:
|
||||||
- eval 'source $DAMASKROOT/DAMASK_env.sh'
|
- source $DAMASKROOT/DAMASK_env.sh
|
||||||
- module purge
|
- module purge
|
||||||
- cd $DAMASKROOT/PRIVATE/testing
|
- cd $DAMASKROOT/PRIVATE/testing
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@ variables:
|
||||||
#================================================================================================
|
#================================================================================================
|
||||||
# Shortcut names
|
# Shortcut names
|
||||||
#================================================================================================
|
#================================================================================================
|
||||||
DAMASKROOT: "/tmp/GitlabCI_Pipeline_$CI_PIPELINE_ID/DAMASK"
|
DAMASKROOT: "$HOME/GitlabCI_Pipeline_$CI_PIPELINE_ID/DAMASK"
|
||||||
|
|
||||||
#================================================================================================
|
#================================================================================================
|
||||||
# Names of module files to load
|
# Names of module files to load
|
||||||
|
@ -87,7 +87,7 @@ checkout:
|
||||||
- cd $DAMASKROOT
|
- cd $DAMASKROOT
|
||||||
- git checkout $CI_COMMIT_SHA
|
- git checkout $CI_COMMIT_SHA
|
||||||
#- git clone -q git@magit1.mpie.de:damask/PRIVATE.git
|
#- git clone -q git@magit1.mpie.de:damask/PRIVATE.git
|
||||||
- eval 'source $DAMASKROOT/DAMASK_env.sh'
|
- source $DAMASKROOT/DAMASK_env.sh
|
||||||
- make install
|
- make install
|
||||||
|
|
||||||
###################################################################################################
|
###################################################################################################
|
||||||
|
|
|
@ -25,11 +25,11 @@ if [[ "x$DAMASK_BIN" != "x" && ! $(echo ":$PATH:" | grep $DAMASK_BIN:) ]]; then
|
||||||
export PATH=$DAMASK_BIN:$PATH
|
export PATH=$DAMASK_BIN:$PATH
|
||||||
fi
|
fi
|
||||||
|
|
||||||
SOLVER=$(which DAMASK_spectral 2>/dev/null)
|
SOLVER=$(which DAMASK_spectral || true 2>/dev/null)
|
||||||
if [ "x$SOLVER" == "x" ]; then
|
if [ "x$SOLVER" == "x" ]; then
|
||||||
SOLVER='Not found!'
|
SOLVER='Not found!'
|
||||||
fi
|
fi
|
||||||
PROCESSING=$(which postResults 2>/dev/null)
|
PROCESSING=$(which postResults || true 2>/dev/null)
|
||||||
if [ "x$PROCESSING" == "x" ]; then
|
if [ "x$PROCESSING" == "x" ]; then
|
||||||
PROCESSING='Not found!'
|
PROCESSING='Not found!'
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue