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

storing documentation and results of runtime tests

This commit is contained in:
Martin Diehl 2017-05-12 09:39:33 +02:00
parent 464fafa736
commit c7632dcf42
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
.gitlab-ci.yml
View File

@ -16,8 +16,10 @@ stages:
- example - example
- performance - performance
- createDocumentation - createDocumentation
- saveDocumentation
- updateMaster - updateMaster
- clean - clean
- releaseLock
################################################################################################### ###################################################################################################
before_script: before_script:
@ -92,6 +94,7 @@ checkout:
- git submodule update --init - git submodule update --init
- source DAMASK_env.sh - source DAMASK_env.sh
- make processing - make processing
- mkdir $BACKUP/$CI_COMMIT_SHA
except: except:
- master - master
- release - release
@ -434,7 +437,7 @@ SpectralRuntime:
- cd $DAMASKROOT - cd $DAMASKROOT
- make clean spectral processing OPTIMIZATION=AGGRESSIVE - make clean spectral processing OPTIMIZATION=AGGRESSIVE
- cd $DAMASKROOT/PRIVATE/testing - cd $DAMASKROOT/PRIVATE/testing
- SpectralAll_runtime/test.py - SpectralAll_runtime/test.py -d $TESTROOT
except: except:
- master - master
- release - release
@ -476,6 +479,19 @@ Spectral:
- master - master
- release - release
##################################################################################################
mergeIntoMaster:
stage: saveDocumentation
script:
- cp $TESTROOT/time.txt $BACKUP/$CI_COMMIT_SHA
- mv $TESTROOT/time.png $BACKUP/$CI_COMMIT_SHA
- cp $TESTROOT/time.txt $BACKUP/$CI_COMMIT_SHA
- mv $TESTROOT/time.png $BACKUP/$CI_COMMIT_SHA
- mv $DAMASKROOT/PRIVATE/documenting/DAMASK_* $BACKUP/$CI_COMMIT_SHA/
except:
- master
- release
################################################################################################## ##################################################################################################
mergeIntoMaster: mergeIntoMaster:
stage: updateMaster stage: updateMaster
@ -492,13 +508,24 @@ mergeIntoMaster:
- git pull - 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 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 - git push origin development # development is unchanged (as master is based on it) but has updated VERSION file
- sed -i "/$CI_PIPELINE_ID/d" $TESTROOT/GitLabCI.queue
only: only:
- development - development
################################################################################################### ###################################################################################################
removeLock: removeData:
stage: clean stage: clean
before_script:
- echo 'Do nothing'
script:
- rm -rf $TESTROOT/GitLabCI_Pipeline_$CI_PIPELINE_ID
- sed -i "/$CI_PIPELINE_ID/d" $TESTROOT/GitLabCI.queue # in case pipeline was manually (web GUI) restarted and releaseLock was performed already
except:
- master
- release
###################################################################################################
removeLock:
stage: releaseLock
before_script: before_script:
- echo 'Do nothing' - echo 'Do nothing'
when: always when: always

2
PRIVATE

@ -1 +1 @@
Subproject commit 3ba3671e3d0ec9ac1dcc6a5521822b4828574581 Subproject commit a629ee95c53924f2da16e8981855f9abcc1d50f7