From 419c430f7ec7a01749b45e0be8b09ca6133ffea8 Mon Sep 17 00:00:00 2001 From: krzys_h Date: Mon, 23 Apr 2018 19:03:38 +0200 Subject: [PATCH] Jenkinsfile: Make colobot-lint use Clang flags --- Jenkinsfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5548e186..9ba966a7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -91,6 +91,11 @@ pipeline { } stage('Run colobot-lint') { + environment { + CC = '/usr/lib/llvm-3.6/bin/clang' + CXX = '/usr/lib/llvm-3.6/bin/clang++' + CLANG_PREFIX = '/usr/lib/llvm-3.6' + } steps { copyArtifacts filter: 'build/colobot-lint,build/html_report.tar.gz,Tools/count_errors.py', fingerprintArtifacts: true, projectName: 'colobot/colobot-lint/master', selector: lastSuccessful(), target: 'colobot-lint' sh 'chmod +x colobot-lint/Tools/count_errors.py' // TODO: ??? @@ -110,7 +115,7 @@ COLOBOT_LINT_BUILD_DIR="$WORKSPACE/colobot-lint/build" COLOBOT_LINT_REPORT_FILE="$WORKSPACE/build/lint/colobot_lint_report.xml" -CLANG_PREFIX="/usr/lib/llvm-3.6" +# CLANG_PREFIX="/usr/lib/llvm-3.6" # Set in top-level environment block cd "$COLOBOT_LINT_BUILD_DIR" chmod +x ./colobot-lint