From 6ced308e98e41e8de0355face47bb6d73dc62c30 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 7 Oct 2021 14:47:38 +0200 Subject: [PATCH] avoid failed test after release --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cb3e04106..39bd4820a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -241,9 +241,10 @@ merge_into_master: - cd $DAMASKROOT - export TESTEDREV=$(git describe) # might be detached from development branch - echo $TESTEDREV > python/damask/VERSION + - git add python/damask/VERSION - > git diff-index --quiet HEAD || - git commit python/damask/VERSION -m "[skip ci] updated version information after successful test of $TESTEDREV" + git commit -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