Changeset 5157ba7

Timestamp:

May 1, 2019, 3:32:19 PM (7 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

da09ba1

Parents:

42a36d9 (diff), 734014e (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/FullBuild (modified) (2 diffs)
• Jenkinsfile (modified) (2 diffs)

Jenkins/FullBuild

@@ -17 +17 @@
 
                                 parallel (
-                                        gcc_6_x64: { trigger_build( 'gcc-6',   'x64', true  ) },
-                                        gcc_6_x86: { trigger_build( 'gcc-6',   'x86', true  ) },
-                                        gcc_5_x64: { trigger_build( 'gcc-5',   'x64', false ) },
-                                        gcc_5_x86: { trigger_build( 'gcc-5',   'x86', false ) },
-                                        clang_x64: { trigger_build( 'clang',   'x64', false ) },
-                                        clang_x86: { trigger_build( 'clang',   'x86', false ) },
+                                        gcc_6_x64: { trigger_build( 'gcc-6',   'x64' ) },
+                                        gcc_6_x86: { trigger_build( 'gcc-6',   'x86' ) },
+                                        gcc_5_x64: { trigger_build( 'gcc-5',   'x64' ) },
+                                        gcc_5_x86: { trigger_build( 'gcc-5',   'x86' ) },
+                                        clang_x64: { trigger_build( 'clang',   'x64' ) },
+                                        clang_x86: { trigger_build( 'clang',   'x86' ) },
                                 )
                         }
@@ -76 +76 @@
                         [$class: 'BooleanParameterValue',               \
                           name: 'Publish',                              \
-                          value: publish],                              \
+                          value: true],                                 \
                         [$class: 'BooleanParameterValue',               \
                           name: 'Silent',                               \

Jenkinsfile

@@ -170 +170 @@
         build_stage('Publish') {
 
-                if( !Settings.RunBenchmark ) { echo 'No results to publish!!!' }
+                if( Settings.Publish && !Settings.RunBenchmark ) { echo 'No results to publish!!!' }
 
                 def groupCompile = new PlotGroup('Compilation', 'seconds', true)
@@ -433 +433 @@
 }
 
-def do_plot(boolean silent, String file, PlotGroup group, String title) {
-
-        def series = silent ? [] : [[
+def do_plot(boolean new_data, String file, PlotGroup group, String title) {
+
+        if(new_data) {
+                echo "Publishing new data"
+        }
+
+        def series = new_data ? [] : [[
                                 file: "${file}.csv",
                                 exclusionValues: '',