From 88362a235229fb83b00d554766f3f6a98978d640 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Mon, 25 Mar 2019 21:55:27 -0600 Subject: [PATCH] fix indentation --- contrib/ci/Jenkinsfile.osx | 116 ++++++++++++++++++------------------ contrib/ci/Jenkinsfile.tidy | 106 ++++++++++++++++---------------- 2 files changed, 110 insertions(+), 112 deletions(-) diff --git a/contrib/ci/Jenkinsfile.osx b/contrib/ci/Jenkinsfile.osx index 68205e5b8b..b9c556d55d 100644 --- a/contrib/ci/Jenkinsfile.osx +++ b/contrib/ci/Jenkinsfile.osx @@ -41,80 +41,80 @@ pipeline stage("main") { - agent { - node { - label 'osx' - } - } - - post { cleanup { cleanWs() } } - - stages - { - stage("check") - { - when { - allOf { - not {branch 'master'} + agent { + node { + label 'osx' } } - steps + post { cleanup { cleanWs() } } + + stages { - githubNotify context: 'OSX', description: 'pending...', status: 'PENDING' - sh ''' + stage("check") + { + when { + allOf { + not {branch 'master'} + } + } + + steps + { + githubNotify context: 'OSX', description: 'pending...', status: 'PENDING' + sh ''' wget -q -O - https://api.github.com/repos/dealii/dealii/issues/${CHANGE_ID}/labels | grep 'ready to test' || \ { echo "This commit will only be tested when it has the label 'ready to test'. Trigger a rebuild by adding a comment that contains '/rebuild'..."; exit 1; } - ''' - } - post - { - failure - { - githubNotify context: 'OSX', description: 'need ready to test label and /rebuild', status: 'PENDING' - script + ''' + } + post { - currentBuild.result='NOT_BUILT' + failure + { + githubNotify context: 'OSX', description: 'need ready to test label and /rebuild', status: 'PENDING' + script + { + currentBuild.result='NOT_BUILT' + } + } } } - } - } - stage('build') - { - steps - { - timeout(time: 1, unit: 'HOURS') + stage('build') { - sh "echo \"building on node ${env.NODE_NAME}\"" - sh '''#!/bin/bash - mkdir build && cd build - cmake \ - -D DEAL_II_WITH_MPI=OFF \ - -D DEAL_II_CXX_FLAGS='-Werror' \ - -D CMAKE_BUILD_TYPE=Debug \ - $WORKSPACE/ && make -j 4 - ''' + steps + { + timeout(time: 1, unit: 'HOURS') + { + sh "echo \"building on node ${env.NODE_NAME}\"" + sh '''#!/bin/bash + mkdir build && cd build + cmake \ + -D DEAL_II_WITH_MPI=OFF \ + -D DEAL_II_CXX_FLAGS='-Werror' \ + -D CMAKE_BUILD_TYPE=Debug \ + $WORKSPACE/ && make -j 4 + ''' + } + } + + post + { + failure + { + githubNotify context: 'OSX', description: 'build failed', status: 'FAILURE' + } + } } - } - post - { - failure + stage("finalize") { - githubNotify context: 'OSX', description: 'build failed', status: 'FAILURE' + steps + { + githubNotify context: 'OSX', description: 'OK', status: 'SUCCESS' + } } } } - - stage("finalize") - { - steps - { - githubNotify context: 'OSX', description: 'OK', status: 'SUCCESS' - } - } - } - } } } diff --git a/contrib/ci/Jenkinsfile.tidy b/contrib/ci/Jenkinsfile.tidy index 80ebb236a8..6aa1179e43 100644 --- a/contrib/ci/Jenkinsfile.tidy +++ b/contrib/ci/Jenkinsfile.tidy @@ -42,74 +42,72 @@ pipeline stage("main") { - - agent - { - docker - { - image 'tjhei/candi-base-clang' - } - } - - post { cleanup { cleanWs() } } - - stages - { - stage("check") - { - when { - allOf { - not {branch 'master'} + agent + { + docker + { + image 'tjhei/candi-base-clang' } } - steps + post { cleanup { cleanWs() } } + + stages { - githubNotify context: 'tidy', description: 'pending...', status: 'PENDING' - sh ''' + stage("check") + { + when { + allOf { + not {branch 'master'} + } + } + + steps + { + githubNotify context: 'tidy', description: 'pending...', status: 'PENDING' + sh ''' wget -q -O - https://api.github.com/repos/dealii/dealii/issues/${CHANGE_ID}/labels | grep 'ready to test' || \ { echo "This commit will only be tested when it has the label 'ready to test'. Trigger a rebuild by adding a comment that contains '/rebuild'..."; exit 1; } - ''' - } - post - { - failure - { - githubNotify context: 'tidy', description: 'need ready to test label and /rebuild', status: 'PENDING' - script + ''' + } + post { - currentBuild.result='NOT_BUILT' + failure + { + githubNotify context: 'tidy', description: 'need ready to test label and /rebuild', status: 'PENDING' + script + { + currentBuild.result='NOT_BUILT' + } + } } } - } - } - stage('build') - { - steps - { - timeout(time: 2, unit: 'HOURS') + stage('build') { - sh "echo \"building on node ${env.NODE_NAME}\"" - - sh '''#!/bin/bash - mkdir build && cd build - $WORKSPACE/contrib/utilities/run_clang_tidy.sh $WORKSPACE - ''' - githubNotify context: 'tidy', description: 'OK', status: 'SUCCESS' - } - } + steps + { + timeout(time: 2, unit: 'HOURS') + { + sh "echo \"building on node ${env.NODE_NAME}\"" + sh '''#!/bin/bash + mkdir build && cd build + $WORKSPACE/contrib/utilities/run_clang_tidy.sh $WORKSPACE + ''' + githubNotify context: 'tidy', description: 'OK', status: 'SUCCESS' + } + } - post - { - failure - { - githubNotify context: 'tidy', description: 'build failed', status: 'FAILURE' + post + { + failure + { + githubNotify context: 'tidy', description: 'build failed', status: 'FAILURE' + } + } } + } } - - } - } } } -- 2.39.5