Changeset 9f5bb817

Timestamp:

Jan 24, 2019, 12:22:46 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

2407853

Parents:

a3e8281

Message:

PrettyGitLogs? now requires both the source dir and the build dir but can be called from anywhere

Files:

• Jenkinsfile (modified) (1 diff)
• tools/PrettyGitLogs.sh (modified) (1 diff)

Jenkinsfile

@@ -185 +185 @@
         if (!Settings || !Settings.GitOldRef || !Settings.GitNewRef) return "\nERROR retrieveing git information!\n"
 
-        sh "${SrcDir}/tools/PrettyGitLogs.sh ${BuildDir} ${Settings.GitOldRef} ${Settings.GitNewRef}"
+        sh "${SrcDir}/tools/PrettyGitLogs.sh ${SrcDir} ${BuildDir} ${Settings.GitOldRef} ${Settings.GitNewRef}"
 
         def gitUpdate = readFile("${BuildDir}/GIT_UPDATE")

tools/PrettyGitLogs.sh

@@ -3 +3 @@
 set -e
 
-GIT_UPDATE="$1/GIT_UPDATE"
-GIT_LOG="$1/GIT_LOG"
-GIT_DIFF="$1/GIT_DIFF"
+GIT="git --git-dir=$1/.git"
+
+GIT_UPDATE="$2/GIT_UPDATE"
+GIT_LOG="$2/GIT_LOG"
+GIT_DIFF="$2/GIT_DIFF"
 
 rm -f ${GIT_UPDATE}  ${GIT_LOG}  ${GIT_DIFF}
 
-GitOldRef=$2
-GitNewRef=$3
+GitOldRef=$3
+GitNewRef=$4