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

ci: Improve checkout script output

Browse Source 
We are currently not very good at communicating what's going in,
in particular for non-merge request pipelines where the output
is usually just "Using origin/master instead" (instead of what?).

Improve this by consistently communicate what we are looking for,
whether we found it, and what we end up doing.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1529>
This commit is contained in:
Florian Müllner 2020-12-11 14:30:05 +01:00
parent 0c6df924be
commit 3cf35ce6df
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,10 +2,11 @@
mutter_target= mutter_target=
git clone https://gitlab.gnome.org/GNOME/mutter.git echo -n Cloning into mutter ...
if git clone --quiet https://gitlab.gnome.org/GNOME/mutter.git; then
if [ $? -ne 0 ]; then echo \ done
echo Checkout failed else
echo \ failed
exit 1 exit 1
fi fi
@ -15,19 +16,27 @@ if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
merge_request_remote=${CI_MERGE_REQUEST_SOURCE_PROJECT_URL//gnome-shell/mutter} merge_request_remote=${CI_MERGE_REQUEST_SOURCE_PROJECT_URL//gnome-shell/mutter}
merge_request_branch=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME merge_request_branch=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
echo Looking for $merge_request_branch on remote ... echo -n Looking for $merge_request_branch on remote ...
if git fetch -q $merge_request_remote $merge_request_branch 2>/dev/null; then if git fetch -q $merge_request_remote $merge_request_branch 2>/dev/null; then
echo \ found
mutter_target=FETCH_HEAD mutter_target=FETCH_HEAD
else else
echo \ not found
mutter_target=origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME mutter_target=origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
echo Using $mutter_target instead echo Using $mutter_target instead
fi fi
fi fi
if [ -z "$mutter_target" ]; then if [ -z "$mutter_target" ]; then
echo -n Looking for $CI_COMMIT_REF on remote ...
mutter_target=$(git branch -r -l origin/$CI_COMMIT_REF_NAME) mutter_target=$(git branch -r -l origin/$CI_COMMIT_REF_NAME)
mutter_target=${mutter_target:-origin/master} if [ "$mutter_target" ]; then
echo Using $mutter_target instead echo \ found
else
echo \ not found
mutter_target=${mutter_target:-origin/master}
echo Using $mutter_target instead
fi
fi fi
git checkout -q $mutter_target git checkout -q $mutter_target