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 polishing-for-beta

This commit is contained in:
Martin Diehl 2021-07-01 14:26:03 +02:00
parent 0fadcac1d8 b567194fe9
commit a709698235
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.gitlab-ci.yml
View File

@ -199,12 +199,12 @@ core:
- release - release
# Needs closer look # Needs closer look
#Phenopowerlaw_singleSlip: # Phenopowerlaw_singleSlip:
# stage: fortran # stage: fortran
# script: Phenopowerlaw_singleSlip/test.py # script: Phenopowerlaw_singleSlip/test.py
# except: # except:
# - master # - master
# - release # - release
################################################################################################### ###################################################################################################
SpectralRuntime: SpectralRuntime:
@ -259,7 +259,9 @@ merge_into_master:
- 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 > python/damask/VERSION - echo $TESTEDREV > python/damask/VERSION
- git commit python/damask/VERSION -m "[skip ci] updated version information after successful test of $TESTEDREV" - >
git diff-index --quiet HEAD ||
git commit python/damask/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
- git merge $UPDATEDREV -s recursive -X ours # conflicts occur only for inconsistent state - git merge $UPDATEDREV -s recursive -X ours # conflicts occur only for inconsistent state

2
PRIVATE

@ -1 +1 @@
Subproject commit 698b255cc0a6e496f1917992dd4dafc6d50b66b3 Subproject commit 1361c4a9f090a76dfcec5bd6dd4eb5e3b4b78cb2