From 386c9659ab3c59b34ad2800ad2ab72721a59d9dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Bergstr=C3=B6m?= Date: Fri, 13 Nov 2015 09:41:21 +1100 Subject: [PATCH] linter: prepare for using clang-format --- setup/linter/ansible-vars.yaml | 1 + setup/linter/resources/jenkins | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/setup/linter/ansible-vars.yaml b/setup/linter/ansible-vars.yaml index 4ff43a00d..a15934e9f 100644 --- a/setup/linter/ansible-vars.yaml +++ b/setup/linter/ansible-vars.yaml @@ -11,3 +11,4 @@ packages: - gmake - ccache - node + - llvm-devel diff --git a/setup/linter/resources/jenkins b/setup/linter/resources/jenkins index 438ceb35a..0d45cbc42 100644 --- a/setup/linter/resources/jenkins +++ b/setup/linter/resources/jenkins @@ -40,7 +40,7 @@ pidfile="/var/run/jenkins/jenkins.pid" command="/usr/sbin/daemon" procname="/usr/local/openjdk7/bin/java" command_args="-r -p ${pidfile} ${procname} -jar ${jenkins_jar} ${jenkins_args} > ${jenkins_log_file} 2>&1" -env="PATH=${PATH} OSTYPE=${OSTYPE} NODE_COMMON_PIPE=${NODE_COMMON_PIPE} CC=cc CXX=c++" +env="CLANG_FORMAT=clang-format-devel PATH=${PATH} OSTYPE=${OSTYPE} NODE_COMMON_PIPE=${NODE_COMMON_PIPE} CC=cc CXX=c++" required_files="${procname} ${jenkins_jar}" start_precmd="jenkins_prestart"