From d2b6fdd453aae6b3f3c034061cb96e987b922c5f Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 15 Apr 2017 12:33:52 +0200 Subject: [PATCH 1/5] corrected path --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9aec3a0a..f3c5bdba7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,7 +80,7 @@ checkout: stage: prepareAll before_script: - echo $CI_PIPELINE_ID >> $HOME/GitLabCI.queue - - while [ "$(awk '/$CI_PIPELINE_ID/{print NR}' GitLabCI.queue)" -ne 1 ];do sleep 5m; done + - while [ "$(awk '/$CI_PIPELINE_ID/{print NR}' $HOME/GitLabCI.queue)" -ne 1 ];do sleep 5m; done script: - mkdir -p $DAMASKROOT - git clone -q git@magit1.mpie.de:damask/DAMASK.git $DAMASKROOT @@ -484,7 +484,7 @@ removeLock: before_script: - echo 'Do nothing' when: always - script: sed -i '/$CI_PIPELINE_ID/d' GitLabCI.queue + script: sed -i '/$CI_PIPELINE_ID/d' $HOME/GitLabCI.queue except: - master - release From 65985e3dd788757d70e547ceada161ac2be6e94d Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 15 Apr 2017 12:44:02 +0200 Subject: [PATCH 2/5] correct escape --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f3c5bdba7..d6b3f1012 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,7 +80,7 @@ checkout: stage: prepareAll before_script: - echo $CI_PIPELINE_ID >> $HOME/GitLabCI.queue - - while [ "$(awk '/$CI_PIPELINE_ID/{print NR}' $HOME/GitLabCI.queue)" -ne 1 ];do sleep 5m; done + - while [ $(awk "/$CI_PIPELINE_ID/{print NR}" $HOME/GitLabCI.queue)" -ne 1 ];do sleep 5m; done script: - mkdir -p $DAMASKROOT - git clone -q git@magit1.mpie.de:damask/DAMASK.git $DAMASKROOT @@ -484,7 +484,7 @@ removeLock: before_script: - echo 'Do nothing' when: always - script: sed -i '/$CI_PIPELINE_ID/d' $HOME/GitLabCI.queue + script: sed -i "/$CI_PIPELINE_ID/d" $HOME/GitLabCI.queue except: - master - release From 1344905c7e768e24b264b8057ecbe73445c6003d Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 15 Apr 2017 12:45:11 +0200 Subject: [PATCH 3/5] typo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d6b3f1012..e65d9df60 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,7 +80,7 @@ checkout: stage: prepareAll before_script: - echo $CI_PIPELINE_ID >> $HOME/GitLabCI.queue - - while [ $(awk "/$CI_PIPELINE_ID/{print NR}" $HOME/GitLabCI.queue)" -ne 1 ];do sleep 5m; done + - while [ $(awk "/$CI_PIPELINE_ID/{print NR}" $HOME/GitLabCI.queue) -ne 1 ];do sleep 5m; done script: - mkdir -p $DAMASKROOT - git clone -q git@magit1.mpie.de:damask/DAMASK.git $DAMASKROOT From de48d54201e66874e5b02a4b15eb270bb700d000 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 17 Apr 2017 05:50:41 +0200 Subject: [PATCH 4/5] conflict occured after manual merge+push to master --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e65d9df60..720b19460 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -432,7 +432,7 @@ mergeIntoMaster: - git commit 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 + - git merge $UPDATEDREV -s ours # conflicts occur only for inconsistent state - git push origin master # master is now tested version and has updated VERSION file - git checkout development - git pull From 1dd36c6e28f8d0336a28feb5871aaf9e264c3fb3 Mon Sep 17 00:00:00 2001 From: Test User Date: Mon, 17 Apr 2017 14:56:22 +0200 Subject: [PATCH 5/5] [skip ci] updated version information after successful test of v2.0.1-466-gde48d54 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 1d89fa753..81d039704 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.1-414-g81d0752 +v2.0.1-466-gde48d54