Changeset 7ca6bf1 for Jenkinsfile

Timestamp:

Aug 20, 2025, 12:12:31 PM (6 months ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

1dec8f3

Parents:

9989781 (diff), 7ea4073 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• Jenkinsfile (modified) (7 diffs)

Jenkinsfile

@@ -8 +8 @@
 
 // Globals
-BuildDir  = null
-SrcDir    = null
-Settings  = null
-Tools     = null
+@Field def BuildDir  = null
+@Field def SrcDir    = null
+@Field def Settings  = null
+@Field def Tools     = null
 
 // Local variables
@@ -82 +82 @@
 //===========================================================================================================
 def build() {
-        debug = true
-        release = Settings.RunAllTests || Settings.RunBenchmark
+        def debug = true
+        def release = Settings.RunAllTests || Settings.RunBenchmark
         Tools.BuildStage('Build : configure', true) {
                 // Configure must be run inside the tree
@@ -96 +96 @@
                         //Use the current directory as the installation target so nothing escapes the sandbox
                         //Also specify the compiler by hand
-                        targets=""
+                        def targets=""
                         if( Settings.RunAllTests || Settings.RunBenchmark ) {
                                 targets="--with-target-hosts='host:debug,host:nodebug'"
@@ -150 +150 @@
                 sh 'ulimit -a'
 
-                jopt = '-j $(nproc)'
+                def jopt = '-j $(nproc)'
 
                 Tools.BuildStage('Test: Debug', true) {
@@ -229 +229 @@
 """ + Tools.GitLogMessage()
 
-                def email_to = !Settings.IsSandbox ? "cforall@lists.uwaterloo.ca" : "tdelisle@uwaterloo.ca"
+                def email_to = "cforall@lists.uwaterloo.ca"
 
                 if( Settings && !Settings.Silent ) {
@@ -281 +281 @@
         public final Boolean Publish
         public final Boolean Silent
-        public final Boolean IsSandbox
         public final String DescLong
         public final String DescShort
@@ -340 +339 @@
                 }
 
-                this.IsSandbox          = (branch == "jenkins-sandbox")
                 this.RunAllTests        = param.RunAllTests
                 this.RunBenchmark       = param.RunBenchmark