Skip to content
Snippets Groups Projects
Commit 32fe31fa authored by Martin Christoph Hierholzer's avatar Martin Christoph Hierholzer
Browse files

auto-merge the changed from the project-template

parent df850c58
No related branches found
No related tags found
No related merge requests found
......@@ -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') {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment