From 3cf35ce6dfc40fd1fdf644354bfc59e8e43e24d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 11 Dec 2020 14:30:05 +0100 Subject: [PATCH] ci: Improve checkout script output 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: --- .gitlab-ci/checkout-mutter.sh | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci/checkout-mutter.sh b/.gitlab-ci/checkout-mutter.sh index 9a32b6bbf..0304fe29a 100755 --- a/.gitlab-ci/checkout-mutter.sh +++ b/.gitlab-ci/checkout-mutter.sh @@ -2,10 +2,11 @@ mutter_target= -git clone https://gitlab.gnome.org/GNOME/mutter.git - -if [ $? -ne 0 ]; then - echo Checkout failed +echo -n Cloning into mutter ... +if git clone --quiet https://gitlab.gnome.org/GNOME/mutter.git; then + echo \ done +else + echo \ failed exit 1 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_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 + echo \ found mutter_target=FETCH_HEAD else + echo \ not found mutter_target=origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME echo Using $mutter_target instead fi fi 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=${mutter_target:-origin/master} - echo Using $mutter_target instead + if [ "$mutter_target" ]; then + echo \ found + else + echo \ not found + mutter_target=${mutter_target:-origin/master} + echo Using $mutter_target instead + fi fi git checkout -q $mutter_target