Changeset e365cb5

Timestamp:

Jun 3, 2016, 2:35:28 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, gc_noraii, 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:

b8387fc

Parents:

10a7775 (diff), 37bf576 (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' into ctor

File:

• Jenkinsfile (modified) (4 diffs)

Jenkinsfile

@@ -8 +8 @@
                 def install_dir = pwd tmp: true
                 //checkout the source code and clean the repo
-                sh "rm -rf * ${install_dir}/*"
                 checkout scm
+                sh 'git clean -fdqx'
+                sh 'git reset --hard'
 
         build_stage 'Build'
@@ -31 +32 @@
         build_stage 'Cleanup'
 
-                //Cleanup the install dir
-                sh "rm -rf ${install_dir}/*"
+                //do a maintainer-clean to make sure we need to remake from scratch
+                sh 'make maintainer-clean > /dev/null'
 }
 
@@ -77 +78 @@
                 // timeout(30) {
                 //
-                //      //Wrap build to add timestamp to command line
-                //      wrap([$class: 'TimestamperBuildWrapper']) {
+                        //Wrap build to add timestamp to command line
+                        wrap([$class: 'TimestamperBuildWrapper']) {
 
                                 //Compile using gcc-4.9
@@ -84 +85 @@
                                 cfa_build()
 
-                //      }
+                        }
                 // }