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

Merge branch 'development' into PRIVATEasSubmodule

This commit is contained in:
Martin Diehl 2017-04-13 19:59:33 +02:00
parent b5275ad7b9 45f192be09
commit a2bbf1faaf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -79,7 +79,7 @@ variables:
checkout: checkout:
stage: prepareAll stage: prepareAll
before_script: before_script:
- $HOME/wait.sh - while [ -e $HOME/GitLabCI.lock ]; do sleep 5m; done
- echo $CI_PIPELINE_ID > $HOME/GitLabCI.lock - echo $CI_PIPELINE_ID > $HOME/GitLabCI.lock
script: script:
- mkdir -p $DAMASKROOT - mkdir -p $DAMASKROOT
@ -483,7 +483,7 @@ removeLock:
before_script: before_script:
- echo 'Do nothing' - echo 'Do nothing'
when: always when: always
script: rm $HOME/GitLabCI.lock script: if grep -q $CI_PIPELINE_ID $HOME/GitLabCI.lock; then; rm $HOME/GitLabCI.lock; fi
except: except:
- master - master
- release - release