From 32fe31fa6ea1c6e7fad4407c97882322344f8f3a Mon Sep 17 00:00:00 2001
From: Martin Hierholzer <martin.hierholzer@desy.de>
Date: Thu, 14 Feb 2019 15:01:40 +0100
Subject: [PATCH] auto-merge the changed from the project-template
---
vars/buildTestDeploy.groovy | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/vars/buildTestDeploy.groovy b/vars/buildTestDeploy.groovy
index 03fc95c..056765e 100644
--- a/vars/buildTestDeploy.groovy
+++ b/vars/buildTestDeploy.groovy
@@ -15,6 +15,20 @@ def call(ArrayList<String> dependencyList, String gitUrl='') {
'tumbleweed-Debug',
'tumbleweed-Release' ]
+ // apply changes from project-template
+ script {
+ node('Docker') {
+ sh """
+ git remote add project-template "https://github.com/ChimeraTK/project-template"
+ git remote update
+ git merge --no-edit project-template/master && git push origin master || true
+ """
+ // We could also apply the clang-format style here, but this should be discussed first.
+ // find \( -name '*.cc' -o -name '*.cxx' -o -name '*.c' -o -name '*.cpp' -o -name '*.h' -o -name '*.hpp' -o -name '*.hxx' -o -name '*.hh' \) -exec clang-format-6.0 -style=file -i \{\} \;
+ // git commit -a -m "Automated commit: apply clang-format" && git push origin master || true
+ }
+ }
+
// only keep builds which exist for all dependencies
script {
node('Docker') {
--
GitLab