Changeset ec5d599 for Jenkins

Timestamp:

Dec 5, 2020, 8:48:42 AM (5 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, stuck-waitfor-destruct

Children:

e91a255

Parents:

7c1144b (diff), ad915e0 (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) (5 diffs)
• tools.groovy (modified) (3 diffs)

Jenkins/Distribute

@@ -26 +26 @@
                 wrap([$class: 'TimestamperBuildWrapper']) {
 
-                        final commit = prepare_build()
+                        final commit, build
+                        (commit, build) = prepare_build()
 
                         node('x64') {
@@ -35 +36 @@
 
                                 Tools.Checkout( commit )
+
+                                final version = GetVersion( build )
                         }
 
@@ -74 +77 @@
 // Main compilation routines
 //===========================================================================================================
+def GetVersion(build) {
+        final pver = sh(
+                returnStdout: true,
+                script: "sed 's/AC_INIT(\\[cfa-cc\\],\\[\\(.*\\)\\],\\[cforall@plg.uwaterloo.ca\\])/\\1/;t;d' ${SrcDir}/configure.ac"
+        ).trim()
 
+        final version = "${pver}.${build}"
 
-//Compilation script is done here but environnement set-up and error handling is done in main loop
-// def checkout() {
-//      build_stage('Checkout', true) {
-//              //checkout the source code and clean the repo
-//              final scmVars = checkout scm
-//              Settings.GitNewRef = scmVars.GIT_COMMIT
-//              Settings.GitOldRef = scmVars.GIT_PREVIOUS_COMMIT
+        echo "Package Version: ${pver}"
+        echo "Build   Version: ${build}"
+        echo "Long    Version: ${version}"
 
-//              echo GitLogMessage()
-//      }
-// }
+        return version
+}
+
 
 //===========================================================================================================
@@ -107 +112 @@
                                         defaultValue: '',                                                               \
                                 ],                                                                                              \
+                                [$class: 'StringParameterDefinition',                                           \
+                                        description: 'Build Number to put into the version',                    \
+                                        name: 'Build',                                                                  \
+                                        defaultValue: '0',                                                              \
+                                ],                                                                                              \
                         ],
                 ]])
@@ -121 +131 @@
         echo "Distributing git commit ${ref}"
 
-        return params.GitRef
+        return [params.GitRef, params.Build]
 }
 

Jenkins/tools.groovy

@@ -37 +37 @@
                 //checkout the source code and clean the repo
                 if(commitHash) {
-                        final scmVars = checkout([$class: 'GitSCM', branches: [[name: commitHash ]]])
+                        echo "Checking out commit <${commitHash}>"
+                        final scmVars = checkout([$class: 'GitSCM', branches: [[name: commitHash ]],
+                                userRemoteConfigs: [[
+                                        url: 'cforall@plg.uwaterloo.ca:software/cfa/cfa-cc',
+                                        credentialsId: 'git_key_aug20']]
+                        ])
                         echo GitLogMessage(scmVars.GIT_COMMIT, scmVars.GIT_PREVIOUS_COMMIT)
                 } else {
-
                         final scmVars = checkout scm
                         echo GitLogMessage(scmVars.GIT_COMMIT, scmVars.GIT_PREVIOUS_COMMIT)
@@ -61 +65 @@
 }
 
-def GitLogMessage(String oldRef, String newRef) {
+PrevGitOldRef = ''
+PrevGitNewRef = ''
+def GitLogMessage(String oldRef = '', String newRef = '') {
+        if (!oldRef) { if(!PrevGitOldRef) { return "\nERROR retrieveing current git information!\n"  } else { oldRef = PrevGitOldRef } }
+        if (!newRef) { if(!PrevGitNewRef) { return "\nERROR retrieveing previous git information!\n" } else { newRef = PrevGitNewRef } }
+
         def revText = sh(returnStdout: true, script: "git rev-list ${oldRef}..${newRef}").trim()
         def revList = SplitLines( revText )
@@ -81 +90 @@
         gitDiff = gitDiff.replace('[31m', '<span style="color: #AA0000;">')
         gitDiff = gitDiff.replace('[m', '</span>')
+
+        PrevGitOldRef = oldRef
+        PrevGitNewRef = newRef
 
         return """