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

debugging update procedure

This commit is contained in:
Martin Diehl 2017-04-13 13:07:38 +02:00
parent bdbbcdb908
commit f1c6524c34
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
.gitlab-ci.yml
View File

@ -1,19 +1,19 @@
stages: stages:
- prepareAll - prepareAll
- preprocessing #- preprocessing
- postprocessing #- postprocessing
- compileSpectralIntel #- compileSpectralIntel
- compileSpectralGNU #- compileSpectralGNU
- prepareSpectral #- prepareSpectral
- spectral #- spectral
- compileMarc2014 #- compileMarc2014
- compileMarc2014.2 #- compileMarc2014.2
- compileMarc2015 #- compileMarc2015
- compileMarc2016 #- compileMarc2016
- marc #- marc
- compileAbaqus2016 #- compileAbaqus2016
- compileAbaqus2017 #- compileAbaqus2017
- example #- example
- updateMaster - updateMaster
- createDocumentation - createDocumentation
- clean - clean
@ -310,6 +310,7 @@ mergeIntoMaster:
script: script:
- cd $DAMASKROOT - cd $DAMASKROOT
- export TESTEDREV=$(git describe) # might be detached from development branch - export TESTEDREV=$(git describe) # might be detached from development branch
- echo $TESTEDREV > VERSION
- git commit VERSION -m "[skip ci] updated version information after successful test of $TESTEDREV" - git commit VERSION -m "[skip ci] updated version information after successful test of $TESTEDREV"
- export UPDATEDREV=$(git describe) # tested state + 1 commit - export UPDATEDREV=$(git describe) # tested state + 1 commit
- git checkout master - git checkout master