From: Marc Fehling <mafehling.git@gmail.com>
Date: Thu, 30 Mar 2023 19:53:43 +0000 (-0600)
Subject: Align OSX Jenkinsfile with others.
X-Git-Tag: v9.5.0-rc1~386^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3088cd386768355d047a06ddf9ce20b8ab4eaefd;p=dealii.git

Align OSX Jenkinsfile with others.
---

diff --git a/contrib/ci/Jenkinsfile.osx b/contrib/ci/Jenkinsfile.osx
index bedb1fa13a..428194b51b 100644
--- a/contrib/ci/Jenkinsfile.osx
+++ b/contrib/ci/Jenkinsfile.osx
@@ -13,7 +13,7 @@ Settings to apply inside Jenkins:
   - discover pull requests (remove branches/master)
   - Strategy: merged PR
   - enable "Disable GitHub Multibranch Status Plugin"
-  - trigger build on pull request comment: .* /rebuild.* (without space)
+  - trigger build on pull request comment: .* /rebuild.* (without space!)
   - Jenkinsfile: choose contrib/ci/Jenkinsfile.osx
   - scan: every 4 hours
   - discard: 5+ items
@@ -34,6 +34,7 @@ pipeline
       agent none
       steps
       {
+        githubNotify context: 'Jenkins: OSX', description: 'initializing...',  status: 'PENDING'
         // kill older builds in this PR:
         script { killold.killOldBuilds() }
       }
@@ -41,8 +42,10 @@ pipeline
 
     stage("main")
     {
-      agent {
-        node {
+      agent
+      {
+        node
+        {
           label 'osx'
         }
       }
@@ -55,10 +58,10 @@ pipeline
         {
           when {
             not {
-	      anyOf {
-	        branch 'master'
-	        branch pattern: "dealii-*", comparator: "GLOB"
-	      }
+              anyOf {
+                branch 'master'
+                branch pattern: "dealii-*", comparator: "GLOB"
+              }
             }
           }
 
@@ -102,15 +105,17 @@ pipeline
                       $WORKSPACE/ && make -j 8
                     make test # quicktests
                  '''
+              githubNotify context: 'Jenkins: OSX', description: 'OK',  status: 'SUCCESS'
             }
           }
 
           post
           {
             always
-	    {
+            {
               archiveArtifacts artifacts: 'build/detailed.log', fingerprint: true
             }
+
             failure
             {
               githubNotify context: 'Jenkins: OSX', description: 'build failed',  status: 'FAILURE'
@@ -118,13 +123,6 @@ pipeline
           }
         }
 
-        stage("finalize")
-        {
-          steps
-          {
-            githubNotify context: 'Jenkins: OSX', description: 'OK',  status: 'SUCCESS'
-          }
-        }
       }
     }
   }