8db4f3c67f
If we don't find a branch that matches the branch used in the merge request, we currently fall back to the non-merge-request matching, i.e. first try the current shell branch, then fall back to master. This should work for commits to upstream branches, but not for merge requests to a stable branch. For those, the target branch name is a better fallback. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/509
34 lines
840 B
Bash
Executable File
34 lines
840 B
Bash
Executable File
#!/usr/bin/bash
|
|
|
|
shell_branch=$(git describe --contains --all HEAD)
|
|
mutter_target=
|
|
|
|
git clone https://gitlab.gnome.org/GNOME/mutter.git
|
|
|
|
if [ $? -ne 0 ]; then
|
|
echo Checkout failed
|
|
exit 1
|
|
fi
|
|
|
|
cd mutter
|
|
|
|
if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
|
|
merge_request_remote=${CI_MERGE_REQUEST_SOURCE_PROJECT_URL//gnome-shell/mutter}
|
|
merge_request_branch=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
|
|
|
|
echo Looking for $merge_request_branch on remote ...
|
|
if git fetch -q $merge_request_remote $merge_request_branch; then
|
|
mutter_target=FETCH_HEAD
|
|
else
|
|
mutter_target=origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
|
|
fi
|
|
fi
|
|
|
|
if [ -z "$mutter_target" ]; then
|
|
mutter_target=$(git branch -r -l origin/$shell_branch)
|
|
mutter_target=${mutter_target:-origin/master}
|
|
echo Using $mutter_target instead
|
|
fi
|
|
|
|
git checkout -q $mutter_target
|