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

fixed .zsh script as well, checking out PRIVATE repo again

This commit is contained in:
Martin Diehl 2017-04-13 08:20:30 +02:00
parent 11a3d9c333
commit 97d19320ce
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -83,10 +83,10 @@ checkout:
- echo $CI_PIPELINE_ID > $HOME/GitLabCI.lock - echo $CI_PIPELINE_ID > $HOME/GitLabCI.lock
script: script:
- mkdir -p $DAMASKROOT - mkdir -p $DAMASKROOT
- git clone git@magit1.mpie.de:damask/DAMASK.git $DAMASKROOT - git clone -q git@magit1.mpie.de:damask/DAMASK.git $DAMASKROOT
- 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
- source $DAMASKROOT/DAMASK_env.sh - source $DAMASKROOT/DAMASK_env.sh
- make install - make install

4
DAMASK_env.zsh
View File

@ -19,8 +19,8 @@ if [[ ( "x$DAMASK_BIN" != "x" ) && ( "x$MATCH" = "x" ) ]]; 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`
PROCESSING=`which postResults 2>/dev/null` PROCESSING=`which postResults || True 2>/dev/null`
if [ "x$DAMASK_NUM_THREADS" = "x" ]; then if [ "x$DAMASK_NUM_THREADS" = "x" ]; then
DAMASK_NUM_THREADS=1 DAMASK_NUM_THREADS=1
fi fi