Changeset a9a1d06

Timestamp:

Dec 3, 2020, 9:20:04 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

1ac1f0b

Parents:

34dcc78c (diff), 6c9e0bc (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

Location:

Jenkins

Files:

• Distribute (modified) (3 diffs)
• tools.groovy (modified) (2 diffs)

Jenkins/Distribute

@@ -32 +32 @@
                                 SrcDir    = pwd tmp: false
 
-                                Tools.clean()
+                                Tools.Clean()
 
-                                Tools.checkout( commit )
+                                Tools.Checkout( commit )
                         }
 
@@ -45 +45 @@
         //If an exception is caught we need to change the status and remember to
         //attach the build log to the email
-        catch (Exception caughtError) {
+        // catch (Exception caughtError) {
                 // //rethrow error later
                 // err = caughtError
@@ -56 +56 @@
                 // //Store the result of the build log
                 // currentBuild.result = "${StageName} FAILURE".trim()
-        }
+        // }
 
         finally {

Jenkins/tools.groovy

@@ -24 +24 @@
 // Common compilation routines
 //===========================================================================================================
-def clean() {
+def Clean() {
         BuildStage('Cleanup', true) {
                 // clean the build by wipping the build directory
@@ -33 +33 @@
 }
 
-def checkout(commitHash = null) {
+def Checkout(commitHash = null) {
         BuildStage('Checkout', true) {
                 //checkout the source code and clean the repo
-                final scmVars = ref ? checkout scm : checkout([$class: 'GitSCM', branches: [[name: commitHash ]]])
+                if(commitHash) {
+                        final scmVars = checkout([$class: 'GitSCM', branches: [[name: commitHash ]]])
+                        echo GitLogMessage(scmVars.GIT_COMMIT, scmVars.GIT_PREVIOUS_COMMIT)
+                } else {
 
-                echo GitLogMessage(scmVars.GIT_COMMIT, scmVars.GIT_PREVIOUS_COMMIT)
+                        final scmVars = checkout scm
+                        echo GitLogMessage(scmVars.GIT_COMMIT, scmVars.GIT_PREVIOUS_COMMIT)
+                }
         }
 }