From 0ba1c3cf215b543058d0a40ba04b02182c5a8ffb Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 2 Nov 2017 11:07:43 +0100
Subject: [PATCH] [Jenkins] Added git diff check and xmllint to gcc-job.
---
scripts/jenkins/gcc.groovy | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/scripts/jenkins/gcc.groovy b/scripts/jenkins/gcc.groovy
index acac3702c05..3166e102092 100644
--- a/scripts/jenkins/gcc.groovy
+++ b/scripts/jenkins/gcc.groovy
@@ -24,6 +24,12 @@ if (helper.isOriginMaster(this))
def image = docker.image('ogs6/gcc-gui:latest')
image.pull()
image.inside(defaultDockerArgs) {
+ stage('git diff check') {
+ sh """cd ogs
+ git config core.whitespace -blank-at-eof
+ git diff --check `git merge-base origin/master HEAD`
+ """.stripIndent()
+ }
sh 'cd ogs && git lfs pull'
stage('Install prerequisites Web') {
sh("""
@@ -42,6 +48,10 @@ image.inside(defaultDockerArgs) {
build.linux(script: this)
}
+ stage('xml lint') {
+ sh 'cd ogs && find -name \'*.prj\' -exec xmllint --noout {} \\;'
+ }
+
stage('Test (Linux-Docker)') {
build.linux(script: this, target: 'tests ctest')
}
--
GitLab