From: James D. Forrester <jforrester@wikimedia.org>
Date: Tue, 4 Mar 2014 02:22:43 +0000 (-0800)
Subject: Re-sync OOjs and OOjs UI update scripts
X-Git-Tag: 1.31.0-rc.0~16738^2
X-Git-Url: http://git.cyclocoop.org/clavettes/images/siteon3.jpg?a=commitdiff_plain;h=774dfff5be0213be06900e0c2479dd9bdaa3af13;p=lhc%2Fweb%2Fwiklou.git

Re-sync OOjs and OOjs UI update scripts

Import the changes in 674b2458a25 in the VisualEditor repository where these scripts
were first created (and are still run for non-MediaWiki users).

Commit message in that repo justifies.

Change-Id: I711f3c88cbc1916f3b782771095304b186f7405f
---

diff --git a/resources/oojs-ui/update-oojs-ui.sh b/resources/oojs-ui/update-oojs-ui.sh
index 66536bbaf1..0761edbd52 100755
--- a/resources/oojs-ui/update-oojs-ui.sh
+++ b/resources/oojs-ui/update-oojs-ui.sh
@@ -37,6 +37,11 @@ fi
 # Undo any changes in the oojs-ui directory
 git reset resources/oojs-ui/
 git checkout resources/oojs-ui/
+
+git fetch origin
+# Create a branch of MW if needed, and reset it to master
+git checkout -B update-oojsui origin/master
+
 # Get the old oojs-ui version
 OLDVERSION=$(oojsuihash)
 if [ "x$OLDVERSION" == "x" ]
@@ -64,7 +69,8 @@ then
 	exit 0
 fi
 # Build the distribution
-grunt
+npm install || exit 1
+grunt || exit 1
 # Get the list of changes
 NEWCHANGES=$(git log $OLDVERSION.. --oneline --no-merges --reverse --color=never)
 NEWCHANGESDISPLAY=$(git log $OLDVERSION.. --oneline --no-merges --reverse --color=always)
diff --git a/resources/oojs/update-oojs.sh b/resources/oojs/update-oojs.sh
index 0bdea23031..57c7625882 100755
--- a/resources/oojs/update-oojs.sh
+++ b/resources/oojs/update-oojs.sh
@@ -37,6 +37,11 @@ fi
 # Undo any changes in the oojs directory
 git reset resources/oojs/
 git checkout resources/oojs/
+
+git fetch origin
+# Create a branch of MW if needed, and reset it to master
+git checkout -B update-oojs origin/master
+
 # Get the old oojs version
 OLDVERSION=$(oojshash)
 if [ "x$OLDVERSION" == "x" ]
@@ -64,7 +69,8 @@ then
 	exit 0
 fi
 # Build the distribution
-grunt
+npm install || exit 1
+grunt || exit 1
 # Get the list of changes
 NEWCHANGES=$(git log $OLDVERSION.. --oneline --no-merges --reverse --color=never)
 NEWCHANGESDISPLAY=$(git log $OLDVERSION.. --oneline --no-merges --reverse --color=always)