[gnome-shell] ci: Improve script output
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] ci: Improve script output
- Date: Fri, 26 Apr 2019 19:34:14 +0000 (UTC)
commit ab9710ee7ba43f50ac3a155c5c1b9be3ce3471a9
Author: Florian Müllner <fmuellner gnome org>
Date: Fri Apr 26 20:34:45 2019 +0200
ci: Improve script output
git-fetch's -q flag doesn't suppress warnings, so it's not a full
replacement of the redirection that was removed in commit 8cefd919.
Shut up the cryptic warning and replace it with a clearer log message
instead.
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/511
.gitlab-ci/checkout-mutter.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/.gitlab-ci/checkout-mutter.sh b/.gitlab-ci/checkout-mutter.sh
index 9eb72ebfc..019346748 100755
--- a/.gitlab-ci/checkout-mutter.sh
+++ b/.gitlab-ci/checkout-mutter.sh
@@ -17,10 +17,11 @@ if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
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
+ if git fetch -q $merge_request_remote $merge_request_branch 2>/dev/null; then
mutter_target=FETCH_HEAD
else
mutter_target=origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
+ echo Using $mutter_target instead
fi
fi
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]