Changeset 249091f


Ignore:
Timestamp:
Sep 9, 2019, 5:42:03 PM (2 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
Children:
c57f59d
Parents:
fce01e7
Message:

Some cleanup in Jenkinsfile

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Jenkinsfile

    rfce01e7 r249091f  
    230230        def newRef = Settings.GitNewRef
    231231
    232         def revisions = sh(returnStdout: true, script: "git rev-list ${Settings.GitOldRef}..${Settings.GitNewRef}")
     232        def revisions = sh(returnStdout: true, script: "git rev-list ${oldRef}..${newRef}").trim()
    233233        def gitUpdate = ""
    234234
    235235        revisions.eachLine {
    236236                def rev = it
    237                 def type = sh(returnStdout: true, script: "git cat-file -t ${rev}")
     237                def type = sh(returnStdout: true, script: "git cat-file -t ${rev}").trim()
    238238                gitUpdate = gitUpdate + "       via  ${rev} (${type})"
    239239        }
    240240
    241241        def rev = oldRef
    242         def type = sh(returnStdout: true, script: "git cat-file -t ${rev}")
    243         gitUpdate = gitUpdate + "       via  ${rev} (${type})"
    244 
    245         def gitLog    = sh(returnStdout: true, script: "git rev-list --format=short ${oldRef}...${newRef}")
    246 
    247         def gitDiff   = sh(returnStdout: true, script: "git diff --stat --color ${newRef} ${oldRef}")
     242        def type = sh(returnStdout: true, script: "git cat-file -t ${rev}").trim()
     243        gitUpdate = gitUpdate + "      from  ${rev} (${type})"
     244
     245        def gitLog    = sh(returnStdout: true, script: "git rev-list --format=short ${oldRef}...${newRef}").trim()
     246
     247        def gitDiff   = sh(returnStdout: true, script: "git diff --stat --color ${newRef} ${oldRef}").trim()
    248248        gitDiff = gitDiff.replace('[32m', '<span style="color: #00AA00;">')
    249249        gitDiff = gitDiff.replace('[31m', '<span style="color: #AA0000;">')
Note: See TracChangeset for help on using the changeset viewer.