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

error during merge

This commit is contained in:
Martin Diehl 2017-04-15 12:58:13 +02:00
parent 8bee117401
commit a52010dff2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

@ -80,13 +80,13 @@ checkout:
stage: prepareAll stage: prepareAll
before_script: before_script:
- echo $CI_PIPELINE_ID >> $HOME/GitLabCI.queue - echo $CI_PIPELINE_ID >> $HOME/GitLabCI.queue
- while [ "$(awk '/$CI_PIPELINE_ID/{print NR}' $HOME/GitLabCI.queue)" -ne 1 ];do sleep 5m; done - while [ $(awk "/$CI_PIPELINE_ID/{print NR}" $HOME/GitLabCI.queue) -ne 1 ];do sleep 5m; done
script: script:
- mkdir -p $DAMASKROOT - mkdir -p $DAMASKROOT
- git clone -q --recurse-submodules 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 submodule update - git submodule update --init
- source DAMASK_env.sh - source DAMASK_env.sh
- make install - make install
except: except:
@ -484,7 +484,7 @@ removeLock:
before_script: before_script:
- echo 'Do nothing' - echo 'Do nothing'
when: always when: always
script: sed -i '/$CI_PIPELINE_ID/d' $HOME/GitLabCI.queue script: sed -i "/$CI_PIPELINE_ID/d" $HOME/GitLabCI.queue
except: except:
- master - master
- release - release