Changeset 0797198

Timestamp:

Dec 3, 2020, 5:03:54 PM (4 years ago)

Author:

Colby Alexander Parsons <caparsons@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

55da258

Parents:

8e655f7c (diff), 91aa5ab (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

Files:

• Jenkins/tools.groovy (added)
• Jenkinsfile (modified) (17 diffs)

Jenkinsfile

@@ -2 +2 @@
 
 import groovy.transform.Field
-
-// For skipping stages
-import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 
 //===========================================================================================================
@@ -15 +12 @@
         SrcDir    = pwd tmp: false
         Settings  = null
-        StageName = ''
+        Tools     = null
 
         // Local variables
@@ -66 +63 @@
 
                 //Store the result of the build log
-                currentBuild.result = "${StageName} FAILURE".trim()
+                currentBuild.result = "${tools.StageName} FAILURE".trim()
         }
 
@@ -85 +82 @@
 //===========================================================================================================
 def clean() {
-        build_stage('Cleanup', true) {
+        Tools.BuildStage('Cleanup', true) {
                 // clean the build by wipping the build directory
                 dir(BuildDir) {
@@ -95 +92 @@
 //Compilation script is done here but environnement set-up and error handling is done in main loop
 def checkout() {
-        build_stage('Checkout', true) {
+        Tools.BuildStage('Checkout', true) {
                 //checkout the source code and clean the repo
                 final scmVars = checkout scm
@@ -108 +105 @@
         debug = true
         release = Settings.RunAllTests || Settings.RunBenchmark
-        build_stage('Build : configure', true) {
+        Tools.BuildStage('Build : configure', true) {
                 // Configure must be run inside the tree
                 dir (SrcDir) {
@@ -136 +133 @@
         }
 
-        build_stage('Build : cfa-cpp', true) {
+        Tools.BuildStage('Build : cfa-cpp', true) {
                 // Build outside of the src tree to ease cleaning
                 dir (BuildDir) {
@@ -147 +144 @@
         }
 
-        build_stage('Build : libcfa(debug)', debug) {
+        Tools.BuildStage('Build : libcfa(debug)', debug) {
                 // Build outside of the src tree to ease cleaning
                 dir (BuildDir) {
@@ -154 +151 @@
         }
 
-        build_stage('Build : libcfa(nodebug)', release) {
+        Tools.BuildStage('Build : libcfa(nodebug)', release) {
                 // Build outside of the src tree to ease cleaning
                 dir (BuildDir) {
@@ -161 +158 @@
         }
 
-        build_stage('Build : install', true) {
+        Tools.BuildStage('Build : install', true) {
                 // Build outside of the src tree to ease cleaning
                 dir (BuildDir) {
@@ -171 +168 @@
 def test() {
         try {
-                build_stage('Test: short', !Settings.RunAllTests) {
+                Tools.BuildStage('Test: short', !Settings.RunAllTests) {
                         dir (BuildDir) {
                                 //Run the tests from the tests directory
@@ -178 +175 @@
                 }
 
-                build_stage('Test: full', Settings.RunAllTests) {
+                Tools.BuildStage('Test: full', Settings.RunAllTests) {
                         dir (BuildDir) {
                                         //Run the tests from the tests directory
@@ -196 +193 @@
 
 def benchmark() {
-        build_stage('Benchmark', Settings.RunBenchmark) {
+        Tools.BuildStage('Benchmark', Settings.RunBenchmark) {
                 dir (BuildDir) {
                         //Append bench results
@@ -205 +202 @@
 
 def build_doc() {
-        build_stage('Documentation', Settings.BuildDocumentation) {
+        Tools.BuildStage('Documentation', Settings.BuildDocumentation) {
                 dir ('doc/user') {
                         make_doc()
@@ -217 +214 @@
 
 def publish() {
-        build_stage('Publish', true) {
+        Tools.BuildStage('Publish', true) {
 
                 if( Settings.Publish && !Settings.RunBenchmark ) { echo 'No results to publish!!!' }
@@ -506 +503 @@
                 ]])
 
-        // It's unfortunate but it looks like we need to checkout the entire repo just to get the pretty git printer
+        // It's unfortunate but it looks like we need to checkout the entire repo just to get
+        // - the pretty git printer
+        // - Jenkins.tools
         checkout scm
+
+        Tools = load "Jenkins/tools.groovy"
 
         final settings = new BuildSettings(params, env.BRANCH_NAME)
@@ -515 +516 @@
 
         return settings
-}
-
-def build_stage(String name, boolean run, Closure block ) {
-        StageName = name
-        echo " -------- ${StageName} -------- "
-        if(run) {
-                stage(name, block)
-        } else {
-                stage(name) { Utils.markStageSkippedForConditional(STAGE_NAME) }
-        }
 }