isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: Handle merge requests for non-master branches

Browse Source 
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
This commit is contained in:
Florian Müllner 2019-04-23 19:04:21 +02:00 committed by Florian Müllner
parent 6db9f51bda
commit e5cfdf9f48
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci/checkout-mutter.sh
View File

@ -19,6 +19,8 @@ if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
echo Looking for $merge_request_branch on remote ... echo Looking for $merge_request_branch on remote ...
if git fetch -q $merge_request_remote $merge_request_branch; then if git fetch -q $merge_request_remote $merge_request_branch; then
mutter_target=FETCH_HEAD mutter_target=FETCH_HEAD
else
mutter_target=origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
fi fi
fi fi