From 23b9361bf2c31111fb98a52aefcdbeb6878b113e Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 24 Jun 2021 06:39:27 +0200 Subject: [PATCH] adjusting to new (main) location of VERSION --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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