From eb50ab9f9c662b97100a9bda4ac268dc798505c8 Mon Sep 17 00:00:00 2001
From: Michael Ellerman <mpe@ellerman.id.au>
Date: Fri, 12 Jun 2015 08:16:06 +1000
Subject: [PATCH] do_merge: Add notifications
---
do_merge | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/do_merge b/do_merge
index f463e60..0ad0d44 100755
--- a/do_merge
+++ b/do_merge
@@ -132,11 +132,14 @@ for h in $heads; do
"$bin_dir/do_rm" $rm_files
}
git diff 2>&1 | egrep -q '<<<<<|^\*' && {
- notify-send -u critical -t 0 "merge failed"
+ notify-send -t 0 -u critical "linux-next new conflict found merging $tree!"
+ pushover "linux-next new conflict found merging $tree!"
bash -i || exit
}
# [ "$(git status --porcelain)" ] && {
GIT_EDITOR=: execute git commit -v -a || {
+ notify-send -t 0 -u critical "linux-next commit failed for $tree!"
+ pushover "linux-next commit failed for $tree!"
bash -i || exit
}
execute git diff -M --stat --summary 'HEAD^..'
@@ -147,7 +150,8 @@ for h in $heads; do
[ -f "../merge-fixes/$tree" ] && {
for p in $(cat "../merge-fixes/$tree"); do
"$bin_dir/merge_fix" -n "$p" || {
- notify-send -u critical -t 0 "post merge patch failed"
+ notify-send -t 0 -u critical "linux-next merge fix failed for $tree!"
+ pushover "linux-next merge fix failed for $tree!"
bash -i || exit
}
done
@@ -170,14 +174,19 @@ for h in $heads; do
continue
git push -f "$build_host":"$build_dir" master:refs/heads/next || {
echo git push failed 1>&2
- notify-send -u critical -t 0 "push failed"
+ notify-send -t 0 -u critical "linux-next push failed for $tree!"
+ pushover "linux-next push failed for $tree!"
bash -i || exit
}
"$bin_dir/do_build" || {
echo Build failed 1>&2
- notify-send -u critical -t 0 "build failed"
+ notify-send -t 0 -u critical "linux-next build failed for $tree!"
+ pushover "linux-next build failed for $tree!"
bash -i || exit
}
+
+ notify-send -u normal "Merge and build of $tree successful"
+
need_build=false
done
--
2.39.5