[Libreoffice-commits] buildbot.git: tb/tb_internals.sh

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri May 31 10:16:47 UTC 2019


 tb/tb_internals.sh |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 4ef024b80041f38fde1a1fda18c5f678b3299089
Author:     László Németh <laszlo.nemeth at collabora.com>
AuthorDate: Tue Feb 21 16:47:15 2017 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri May 31 12:16:30 2019 +0200

    fix tb commit links to the online repository
    
    If the tinderbox branch name contains "online", use
    libreoffice/online in commit links instead of libreoffice/core,
    also set link text "online" instead of "core".
    
    Change-Id: Idcc88491c3fad11435a061bec36fea89184d39fc
    Reviewed-on: https://gerrit.libreoffice.org/73248
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/tb/tb_internals.sh b/tb/tb_internals.sh
index 784a0a3..7f7cc04 100644
--- a/tb/tb_internals.sh
+++ b/tb/tb_internals.sh
@@ -278,8 +278,12 @@ find_dev_install_location()
 generate_cgit_link()
 {
     local sha="$1"
-
-    echo "<a href='http://cgit.freedesktop.org/libreoffice/core/log/?id=$sha'>core</a>"
+    local branch="$2"
+    if [[ $branch == *"online"* ]]; then
+        echo "<a href='http://cgit.freedesktop.org/libreoffice/online/log/?id=$sha'>online</a>"
+    else
+        echo "<a href='http://cgit.freedesktop.org/libreoffice/core/log/?id=$sha'>core</a>"
+    fi
 }
 
 get_commits_since_last_good()
@@ -808,7 +812,7 @@ tinderbox: END
         (
             echo "$message_content"
             cat "${TB_METADATA_DIR?}/${P?}_current-git-timestamp.log"
-            for cm in $(cat "${TB_METADATA_DIR?}/${P?}_current-git-head.log") ; do echo "TinderboxPrint: $(generate_cgit_link "${cm}")" ; done
+            for cm in $(cat "${TB_METADATA_DIR?}/${P?}_current-git-head.log") ; do echo "TinderboxPrint: $(generate_cgit_link "${cm}" "$TB_TINDERBOX_BRANCH?}")" ; done
             cat tb_${P?}_autogen.log tb_${P?}_clean.log tb_${P?}_build.log tb_${P?}_tests.log 2>/dev/null
         ) | gzip -c > "${gzlog}"
         xtinder="X-Tinder: gzookie"


More information about the Libreoffice-commits mailing list