[gnome-shell/wip/fmuellner/really-fix-stable-ci] ci: Try harder to find a matching mutter branch



commit c062be25d662097b5d988935ea0d6cd7e9ed811a
Author: Florian Müllner <fmuellner gnome org>
Date:   Thu Apr 25 23:11:11 2019 +0200

    ci: Try harder to find a matching mutter branch
    
    Depending on how gitlab's CI checks out gnome-shell, the shell branch
    may not have a local reference like "gnome-3-32", but only a remote
    one like "remotes/origin/gnome-3-32".
    
    Consider that case as well when looking for a corresponding mutter branch.
    
    https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/511

 .gitlab-ci/checkout-mutter.sh | 1 +
 1 file changed, 1 insertion(+)
---
diff --git a/.gitlab-ci/checkout-mutter.sh b/.gitlab-ci/checkout-mutter.sh
index 618ad2582..9eb72ebfc 100755
--- a/.gitlab-ci/checkout-mutter.sh
+++ b/.gitlab-ci/checkout-mutter.sh
@@ -26,6 +26,7 @@ fi
 
 if [ -z "$mutter_target" ]; then
   mutter_target=$(git branch -r -l origin/$shell_branch)
+  mutter_target=${mutter_target:-$(git branch -r -l ${shell_branch#remotes/})}
   mutter_target=${mutter_target:-origin/master}
   echo Using $mutter_target instead
 fi


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]