From b3066122dcd5be77625897622978d559fa7c5e17 Mon Sep 17 00:00:00 2001 From: Test User Date: Fri, 14 Apr 2017 08:46:11 +0200 Subject: [PATCH 1/3] [skip ci] updated version information after successful test of v2.0.1-455-gae3a518 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 1d89fa753..264798992 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.1-414-g81d0752 +v2.0.1-455-gae3a518 From 1dd36c6e28f8d0336a28feb5871aaf9e264c3fb3 Mon Sep 17 00:00:00 2001 From: Test User Date: Mon, 17 Apr 2017 14:56:22 +0200 Subject: [PATCH 2/3] [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 From 1768d8f103c384e0dd43991d929eebfffad3090e Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 18 Apr 2017 05:37:36 +0200 Subject: [PATCH 3/3] update of VERSION file should not trigger new GitLabCI --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 720b19460..00b9a5795 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -436,7 +436,7 @@ mergeIntoMaster: - git push origin master # master is now tested version and has updated VERSION file - git checkout development - git pull - - git merge master -s ours # only possible conflict is in VERSION file + - git merge master -s ours -m "[skip ci] Merge branch 'master' into development" # only possible conflict is in VERSION file - git push origin development # development is unchanged (as master is based on it) but has updated VERSION file only: - development