Changeset 919d1ba for Jenkinsfile

Timestamp:

Jul 11, 2016, 5:20:08 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

6f72453

Parents:

cad355a (diff), deefdc1 (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) (2 diffs)

Jenkinsfile

@@ -176 +176 @@
                                                   defaultValue: false,                                          \
                                                   description: 'If true, the build will be promoted to the do-lang git repository (on successful builds only)', \
-                                                  name: 'promoteBuild2DoLang'                           \
-                                                ]]                                                                      \
+                                                  name: 'promoteBuild2DoLang'                                   \
+                                                ],                                                              \
+                                                [$class: 'ChoiceParameterDefinition',                           \
+                                                  choices: '64-bit\n32-bit',                                    \
+                                                  defaultValue: '64-bit',                                       \
+                                                  description: 'The architecture to use for compilation',       \
+                                                  name: 'buildArchitecture'                                     \
+                                                ]]                                                              \
                                         ]])
 
                                 doPromoteBuild2DoLang = promoteBuild2DoLang == 'true'
-
-                                echo "FULL BUILD = ${doPromoteBuild2DoLang}"
+                                architectureFlag = buildArchitecture == '64-bit' ? '-m64' : (buildArchitecture == '32-bit' ? '-m32' : 'ERROR')
+
+                                echo "FULL BUILD = ${doPromoteBuild2DoLang}\nArchitecture = ${buildArchitecture} (flag ${architectureFlag})"
 
                                 //Compile using gcc-4.9
@@ -222 +229 @@
         finally {
                 //Send email with final results
-                notify_result(doPromoteBuild2DoLang, err, currentBuild.result, log_needed)
+                //notify_result(doPromoteBuild2DoLang, err, currentBuild.result, log_needed)
 
                 /* Must re-throw exception to propagate error */