From 4bcc57add7ead54ad18f02d093baf9aad8d1fd1b Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 14 May 2017 08:48:54 +0200 Subject: [PATCH 1/3] typo, tried to copy time data again instead of memory data --- .gitlab-ci.yml | 4 ++-- PRIVATE | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2701edcc0..6eb527fbb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -485,8 +485,8 @@ backupData: - mkdir $BACKUP/${CI_PIPELINE_ID}_${CI_COMMIT_SHA} - cp $TESTROOT/time.txt $BACKUP/${CI_PIPELINE_ID}_${CI_COMMIT_SHA}/ - mv $TESTROOT/time.png $BACKUP/${CI_PIPELINE_ID}_${CI_COMMIT_SHA}/ - - cp $TESTROOT/time.txt $BACKUP/${CI_PIPELINE_ID}_${CI_COMMIT_SHA}/ - - mv $TESTROOT/time.png $BACKUP/${CI_PIPELINE_ID}_${CI_COMMIT_SHA}/ + - cp $TESTROOT/memory.txt $BACKUP/${CI_PIPELINE_ID}_${CI_COMMIT_SHA}/ + - mv $TESTROOT/memory.png $BACKUP/${CI_PIPELINE_ID}_${CI_COMMIT_SHA}/ - mv $DAMASKROOT/PRIVATE/documenting/DAMASK_* $BACKUP/${CI_PIPELINE_ID}_${CI_COMMIT_SHA}/ except: - master diff --git a/PRIVATE b/PRIVATE index a629ee95c..19a53f622 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit a629ee95c53924f2da16e8981855f9abcc1d50f7 +Subproject commit 19a53f6229603aeafb2466b58679a1cd04fc0142 From 4f3b0e4c34fb2503b9fda652d348884e010621a8 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 15 May 2017 06:45:53 +0200 Subject: [PATCH 2/3] symlinks should not be part of the repository --- src/DAMASK_marc2011.f90 | 1 - src/DAMASK_marc2012.f90 | 1 - src/DAMASK_marc2013.1.f90 | 1 - src/DAMASK_marc2013.f90 | 1 - src/DAMASK_marc2014.2.f90 | 1 - src/DAMASK_marc2014.f90 | 1 - src/DAMASK_marc2015.f90 | 1 - 7 files changed, 7 deletions(-) delete mode 120000 src/DAMASK_marc2011.f90 delete mode 120000 src/DAMASK_marc2012.f90 delete mode 120000 src/DAMASK_marc2013.1.f90 delete mode 120000 src/DAMASK_marc2013.f90 delete mode 120000 src/DAMASK_marc2014.2.f90 delete mode 120000 src/DAMASK_marc2014.f90 delete mode 120000 src/DAMASK_marc2015.f90 diff --git a/src/DAMASK_marc2011.f90 b/src/DAMASK_marc2011.f90 deleted file mode 120000 index 2c5bec706..000000000 --- a/src/DAMASK_marc2011.f90 +++ /dev/null @@ -1 +0,0 @@ -DAMASK_marc.f90 \ No newline at end of file diff --git a/src/DAMASK_marc2012.f90 b/src/DAMASK_marc2012.f90 deleted file mode 120000 index 2c5bec706..000000000 --- a/src/DAMASK_marc2012.f90 +++ /dev/null @@ -1 +0,0 @@ -DAMASK_marc.f90 \ No newline at end of file diff --git a/src/DAMASK_marc2013.1.f90 b/src/DAMASK_marc2013.1.f90 deleted file mode 120000 index 2c5bec706..000000000 --- a/src/DAMASK_marc2013.1.f90 +++ /dev/null @@ -1 +0,0 @@ -DAMASK_marc.f90 \ No newline at end of file diff --git a/src/DAMASK_marc2013.f90 b/src/DAMASK_marc2013.f90 deleted file mode 120000 index 2c5bec706..000000000 --- a/src/DAMASK_marc2013.f90 +++ /dev/null @@ -1 +0,0 @@ -DAMASK_marc.f90 \ No newline at end of file diff --git a/src/DAMASK_marc2014.2.f90 b/src/DAMASK_marc2014.2.f90 deleted file mode 120000 index 2c5bec706..000000000 --- a/src/DAMASK_marc2014.2.f90 +++ /dev/null @@ -1 +0,0 @@ -DAMASK_marc.f90 \ No newline at end of file diff --git a/src/DAMASK_marc2014.f90 b/src/DAMASK_marc2014.f90 deleted file mode 120000 index 2c5bec706..000000000 --- a/src/DAMASK_marc2014.f90 +++ /dev/null @@ -1 +0,0 @@ -DAMASK_marc.f90 \ No newline at end of file diff --git a/src/DAMASK_marc2015.f90 b/src/DAMASK_marc2015.f90 deleted file mode 120000 index 2c5bec706..000000000 --- a/src/DAMASK_marc2015.f90 +++ /dev/null @@ -1 +0,0 @@ -DAMASK_marc.f90 \ No newline at end of file From 9724c95f58de5a8f6a82ef3843735871749bc25d Mon Sep 17 00:00:00 2001 From: Test User Date: Mon, 15 May 2017 15:23:16 +0200 Subject: [PATCH 3/3] [skip ci] updated version information after successful test of v2.0.1-719-g4f3b0e4 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 0b350382b..e39f391eb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.1-715-g5d58752 +v2.0.1-719-g4f3b0e4