[gnome-shell/test-3-32] ci: Try harder to find a matching mutter branch
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/test-3-32] ci: Try harder to find a matching mutter branch
- Date: Thu, 25 Apr 2019 21:31:20 +0000 (UTC)
commit e578bfc908856dec7f1302b9e8b858ba6059e77e
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.
.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]