diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8e73a6da..30c663545 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -269,8 +269,8 @@ merge_into_master: 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" + - echo $TESTEDREV > python/damask/VERSION + - 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