223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

error in DAMASK_env.sh seems to be the reason

This commit is contained in:
Martin Diehl 2017-04-13 08:15:01 +02:00
parent 50b3523927
commit 11a3d9c333
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -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
################################################################################################### ###################################################################################################

4
DAMASK_env.sh
View File

@ -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