From 45fdd03ecdd56f26d8589d18f38b073d6b63efbb Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 27 Apr 2022 06:05:06 +0200 Subject: [PATCH] main file at root --- .gitlab-ci.yml | 7 +++---- VERSION | 2 +- python/damask/VERSION | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) mode change 120000 => 100644 VERSION mode change 100644 => 120000 python/damask/VERSION diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 07bad3a12..d740bb2eb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -233,12 +233,11 @@ update_revision: - cd $(mktemp -d) - git clone -q git@git.damask.mpie.de:damask/DAMASK.git . - git pull - - VERSION=$(git describe ${CI_COMMIT_SHA}) - - export VERSION="${VERSION:1}" - - echo ${VERSION} > python/damask/VERSION + - exportVERSION=$(git describe ${CI_COMMIT_SHA}) + - echo ${VERSION:1} > VERSION - > git diff-index --quiet HEAD || - git commit python/damask/VERSION -m "[skip ci] updated version information after successful test of $VERSION" + git commit VERSION -m "[skip ci] updated version information after successful test of $VERSION" - if [ ${CI_COMMIT_SHA} == $(git rev-parse HEAD^) ]; then git push origin HEAD:master HEAD:development; fi only: - development diff --git a/VERSION b/VERSION deleted file mode 120000 index 5d364b3ae..000000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -python/damask/VERSION \ No newline at end of file diff --git a/VERSION b/VERSION new file mode 100644 index 000000000..b162a769d --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +3.0.0-alpha6-258-gea7c8ef23 diff --git a/python/damask/VERSION b/python/damask/VERSION deleted file mode 100644 index b162a769d..000000000 --- a/python/damask/VERSION +++ /dev/null @@ -1 +0,0 @@ -3.0.0-alpha6-258-gea7c8ef23 diff --git a/python/damask/VERSION b/python/damask/VERSION new file mode 120000 index 000000000..558194c5a --- /dev/null +++ b/python/damask/VERSION @@ -0,0 +1 @@ +../../VERSION \ No newline at end of file