diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8ba422480..6a26b703e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -199,12 +199,12 @@ core: - release # Needs closer look -#Phenopowerlaw_singleSlip: -# stage: fortran -# script: Phenopowerlaw_singleSlip/test.py -# except: -# - master -# - release +# Phenopowerlaw_singleSlip: +# stage: fortran +# script: Phenopowerlaw_singleSlip/test.py +# except: +# - master +# - release ################################################################################################### SpectralRuntime: @@ -259,7 +259,9 @@ merge_into_master: - cd $DAMASKROOT - export TESTEDREV=$(git describe) # might be detached from development branch - 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 - git checkout master - git merge $UPDATEDREV -s recursive -X ours # conflicts occur only for inconsistent state diff --git a/PRIVATE b/PRIVATE index 698b255cc..1361c4a9f 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 698b255cc0a6e496f1917992dd4dafc6d50b66b3 +Subproject commit 1361c4a9f090a76dfcec5bd6dd4eb5e3b4b78cb2