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

now also running runtime test

This commit is contained in:
Martin Diehl 2017-05-08 23:52:07 +02:00
parent 26ac20e9ba
commit 742d01765e
1 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
.gitlab-ci.yml
View File

@ -14,6 +14,7 @@ stages:
- compileAbaqus2016 - compileAbaqus2016
- compileAbaqus2017 - compileAbaqus2017
- example - example
- performance
- createDocumentation - createDocumentation
- updateMaster - updateMaster
- clean - clean
@ -425,24 +426,18 @@ AbaqusExample:
only: only:
- development - development
################################################################################################## ###################################################################################################
mergeIntoMaster: SpectralRuntime:
stage: updateMaster stage: performance
script: script:
- module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel
- cd $DAMASKROOT - cd $DAMASKROOT
- export TESTEDREV=$(git describe) # might be detached from development branch - make clean spectral processing OPTIMIZATION=AGGRESSIVE
- echo $TESTEDREV > VERSION - cd $DAMASKROOT/PRIVATE/testing
- git commit VERSION -m "[skip ci] updated version information after successful test of $TESTEDREV" - SpectralAll_runtime/test.py
- export UPDATEDREV=$(git describe) # tested state + 1 commit except:
- git checkout master - master
- git merge $UPDATEDREV -s recursive -X ours # conflicts occur only for inconsistent state - release
- git push origin master # master is now tested version and has updated VERSION file
- git checkout development
- git pull
- git merge master -s recursive -X ours -m "[skip ci] Merge branch 'master' into development" # only possible conflict is in VERSION file
- git push origin development # development is unchanged (as master is based on it) but has updated VERSION file
only:
- development
################################################################################################### ###################################################################################################
AbaqusExp: AbaqusExp:
@ -481,6 +476,25 @@ Spectral:
- master - master
- release - release
##################################################################################################
mergeIntoMaster:
stage: updateMaster
script:
- cd $DAMASKROOT
- 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"
- export UPDATEDREV=$(git describe) # tested state + 1 commit
- git checkout master
- git merge $UPDATEDREV -s recursive -X ours # conflicts occur only for inconsistent state
- git push origin master # master is now tested version and has updated VERSION file
- git checkout development
- git pull
- git merge master -s recursive -X ours -m "[skip ci] Merge branch 'master' into development" # only possible conflict is in VERSION file
- git push origin development # development is unchanged (as master is based on it) but has updated VERSION file
only:
- development
################################################################################################### ###################################################################################################
removeLock: removeLock:
stage: clean stage: clean