Changeset 1fcc2f3 for Jenkinsfile_disabled

Timestamp:

Nov 7, 2019, 2:49:24 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

f2d1335

Parents:

396b830 (diff), d056d0d (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 new-ast

File:

• Jenkinsfile_disabled (modified) (4 diffs)

Jenkinsfile_disabled

@@ -224 +224 @@
 //Routine responsible of sending the email notification once the build is completed
 //===========================================================================================================
+@NonCPS
+def SplitLines(String text) {
+        def list = []
+
+        text.eachLine {
+                list += it
+        }
+
+        return list
+}
+
 def GitLogMessage() {
         if (!Settings || !Settings.GitOldRef || !Settings.GitNewRef) return "\nERROR retrieveing git information!\n"
 
-        sh "${SrcDir}/tools/PrettyGitLogs.sh ${SrcDir} ${BuildDir} ${Settings.GitOldRef} ${Settings.GitNewRef}"
-
-        def gitUpdate = readFile("${BuildDir}/GIT_UPDATE")
-        def gitLog    = readFile("${BuildDir}/GIT_LOG")
-        def gitDiff   = readFile("${BuildDir}/GIT_DIFF")
+        def oldRef = Settings.GitOldRef
+        def newRef = Settings.GitNewRef
+
+        def revText = sh(returnStdout: true, script: "git rev-list ${oldRef}..${newRef}").trim()
+        def revList = SplitLines( revText )
+
+        def gitUpdate = ""
+        revList.each { rev ->
+                def type = sh(returnStdout: true, script: "git cat-file -t ${rev}").trim()
+                gitUpdate = gitUpdate + "       via  ${rev} (${type})"
+        }
+
+        def rev = oldRef
+        def type = sh(returnStdout: true, script: "git cat-file -t ${rev}").trim()
+        gitUpdate = gitUpdate + "      from  ${rev} (${type})"
+
+        def gitLog    = sh(returnStdout: true, script: "git rev-list --format=short ${oldRef}...${newRef}").trim()
+
+        def gitDiff   = sh(returnStdout: true, script: "git diff --stat --color ${newRef} ${oldRef}").trim()
+        gitDiff = gitDiff.replace('[32m', '<span style="color: #00AA00;">')
+        gitDiff = gitDiff.replace('[31m', '<span style="color: #AA0000;">')
+        gitDiff = gitDiff.replace('[m', '</span>')
 
         return """
@@ -330 +358 @@
         BuildSettings(java.util.Collections$UnmodifiableMap param, String branch) {
                 switch( param.Compiler ) {
+                        case 'gcc-9':
+                                this.Compiler = new CC_Desc('gcc-9', 'g++-9', 'gcc-9')
+                        break
+                        case 'gcc-8':
+                                this.Compiler = new CC_Desc('gcc-8', 'g++-8', 'gcc-8')
+                        break
+                        case 'gcc-7':
+                                this.Compiler = new CC_Desc('gcc-7', 'g++-7', 'gcc-7')
+                        break
                         case 'gcc-6':
                                 this.Compiler = new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
@@ -340 +377 @@
                         break
                         case 'clang':
-                                this.Compiler = new CC_Desc('clang', 'clang++', 'gcc-6')
+                                this.Compiler = new CC_Desc('clang', 'clang++-6.0', 'gcc-6')
                         break
                         default :
@@ -402 +439 @@
                                         description: 'Which compiler to use',                                   \
                                         name: 'Compiler',                                                                       \
-                                        choices: 'gcc-6\ngcc-5\ngcc-4.9\nclang',                                        \
-                                        defaultValue: 'gcc-6',                                                          \
+                                        choices: 'gcc-9\ngcc-8\ngcc-7\ngcc-6\ngcc-5\ngcc-4.9\nclang',                                   \
+                                        defaultValue: 'gcc-8',                                                          \
                                 ],                                                                                              \
                                 [$class: 'ChoiceParameterDefinition',                                           \