jenkins-bot has submitted this change and it was merged.

Change subject: Run update.php in `make master`
......................................................................


Run update.php in `make master`

Trim some of its 230 lines of "... already done" output.

Change-Id: I66c44363f8a60abffa3bbc7d48cbed5a539a76d8
---
M Makefile
1 file changed, 6 insertions(+), 6 deletions(-)

Approvals:
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Makefile b/Makefile
index e631279..a415168 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,10 @@
 
 master:
        git fetch
-       echo Here is what is new on origin/master
-       # This doesn't work, despite what gitrevisions(7) says.
-       git log HEAD..origin/master
-       echo Get master
+       @echo Here is what is new on origin/master:
+       @git log HEAD..origin/master
+       @echo Checkout and update master:
        git checkout master && git pull --ff-only
-       echo Update Parsoid and restart it\? Other extensions\?
-       echo Run some tests\!\!\!
+       @echo 'exit( ( $$wgFlowCluster === false && $$wgFlowDefaultWikiDb === 
false) ? 0 : 1 )' | php ../../maintenance/eval.php && echo Apply DB updates 
\(if any\) && php $(MW_INSTALL_PATH)/maintenance/update.php  --quick | sed -n 
'/^[^.]/p' || echo DB updates must be applied manually.
+       @echo TODO Update Parsoid and restart it\? Other extensions\?
+       @echo Run some tests\!\!\!

-- 
To view, visit https://gerrit.wikimedia.org/r/106484
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I66c44363f8a60abffa3bbc7d48cbed5a539a76d8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Spage <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: jenkins-bot <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to