[Intel-gfx] [maintainer-tools PATCH 1/4] dim: update for-next branches as part of nightly rebuild

Jani Nikula jani.nikula at intel.com
Tue Mar 15 09:20:35 UTC 2016

Currently the for-linux-next-fixes and for-linux-next branches only get
updated after the nightly rebuild after pushing branches. If the nightly
rebuild fails at that point, the for-next branches won't get updated
until the next time something is pushed, not upon nightly rebuild. Fix
this by making for-next branch update part of dim rebuild-nightly.

Signed-off-by: Jani Nikula <jani.nikula at intel.com>
 dim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dim b/dim
index 1e7622a1e902..e3fca75bc5e6 100755
--- a/dim
+++ b/dim
@@ -348,8 +348,10 @@ function dim_rebuild_nightly
 		git push $DRY_RUN origin HEAD >& /dev/null && echo "Done."
 		echo "Fail: Branch setup for the rerere-cache is borked."
+		exit 1
+	update_linux_next
 function dim_nightly_forget
@@ -378,7 +380,6 @@ function dim_push_branch
 	git push $DRY_RUN $DIM_DRM_INTEL_REMOTE $branch "$@"
-	update_linux_next

More information about the Intel-gfx mailing list