Changeset fce01e7 for Jenkinsfile

Timestamp:

Sep 9, 2019, 5:33:39 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

249091f

Parents:

dea0b69

Message:

Removing need for PrettyGitLog?

File:

• Jenkinsfile (modified) (1 diff)

Jenkinsfile

@@ -227 +227 @@
         if (!Settings || !Settings.GitOldRef || !Settings.GitNewRef) return "\nERROR retrieveing git information!\n"
 
-        sh "${SrcDir}/tools/PrettyGitLogs.sh ${SrcDir} ${BuildDir} ${Settings.GitOldRef} ${Settings.GitNewRef}"
-
-        def result = sh(returnStdout: true, script: "git rev-list ${Settings.GitOldRef}..${Settings.GitNewRef}")
-        echo result
-
-        def gitUpdate = readFile("${BuildDir}/GIT_UPDATE")
-        def gitLog    = sh(returnStdout: true, script: "git rev-list --format=short ${Settings.GitOldRef}...${Settings.GitNewRef}")
-        def gitDiff   = readFile("${BuildDir}/GIT_DIFF")
+        def oldRef = Settings.GitOldRef
+        def newRef = Settings.GitNewRef
+
+        def revisions = sh(returnStdout: true, script: "git rev-list ${Settings.GitOldRef}..${Settings.GitNewRef}")
+        def gitUpdate = ""
+
+        revisions.eachLine {
+                def rev = it
+                def type = sh(returnStdout: true, script: "git cat-file -t ${rev}")
+                gitUpdate = gitUpdate + "       via  ${rev} (${type})"
+        }
+
+        def rev = oldRef
+        def type = sh(returnStdout: true, script: "git cat-file -t ${rev}")
+        gitUpdate = gitUpdate + "       via  ${rev} (${type})"
+
+        def gitLog    = sh(returnStdout: true, script: "git rev-list --format=short ${oldRef}...${newRef}")
+
+        def gitDiff   = sh(returnStdout: true, script: "git diff --stat --color ${newRef} ${oldRef}")
+        gitDiff = gitDiff.replace('[32m', '<span style="color: #00AA00;">')
+        gitDiff = gitDiff.replace('[31m', '<span style="color: #AA0000;">')
+        gitDiff = gitDiff.replace('[m', '</span>')
 
         return """