]> https://gitweb.dealii.org/ - dealii.git/commitdiff
fix indentation 7859/head
authorTimo Heister <timo.heister@gmail.com>
Tue, 26 Mar 2019 03:55:27 +0000 (21:55 -0600)
committerTimo Heister <timo.heister@gmail.com>
Tue, 26 Mar 2019 03:55:27 +0000 (21:55 -0600)
contrib/ci/Jenkinsfile.osx
contrib/ci/Jenkinsfile.tidy

index 68205e5b8bedb785f044504e48cba57752e042f7..b9c556d55d02fabe0e01f12768c39a231f0e8066 100644 (file)
@@ -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'
-      }
-    }
-  }
-  }
   }
 }
index 80ebb236a8c37d403cff2a8fa5d38f6a978eef38..6aa1179e43dd6bdc9c6344b7631168e343050def 100644 (file)
@@ -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'
+            }
+          }
         }
+
       }
     }
-
-  }
-  }
   }
 }

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.