jenkins-bot has submitted this change and it was merged.
Change subject: Reduce output for updating MediaWiki extensions
......................................................................
Reduce output for updating MediaWiki extensions
Change-Id: I3e9cedda3becb0b7efcc91d2033f115333c01846
---
M bin/repoupdate
A bin/update-reset-repo
2 files changed, 13 insertions(+), 6 deletions(-)
Approvals:
Nikerabbit: Looks good to me, but someone else must approve
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/repoupdate b/bin/repoupdate
index 3710096..37bbb5c 100755
--- a/bin/repoupdate
+++ b/bin/repoupdate
@@ -135,15 +135,14 @@
cd $PROJECT
cd extensions
- echo "Updating git extensions"
+ echo "Updating MediaWiki extensions"
count=0
EXTENSIONS=$(curl -s
"https://gerrit.wikimedia.org/mediawiki-extensions.txt";|egrep -v
"(FundraisingEmailUnsubscribe)")
for EXTENSION in $EXTENSIONS
do
- echo "Checking $EXTENSION"
-
if [ ! -d "$EXTENSION/.git" ]
then
+ echo "Cloning $EXTENSION"
git clone "$REPO_MWEXTGIT/$EXTENSION.git" "$EXTENSION"
if [ "$REPO_RW" = "yes" ]
@@ -160,10 +159,8 @@
cd ..
fi
else
- cd "$EXTENSION"
- git fetch -q --all && git reset -q --hard origin/master
&& git clean -q -f -d &
+ update-reset-repo "$DIR/$PROJECT/extensions/$EXTENSION"
&
let count+=1; [[ $((count%10)) -eq 0 ]] && wait
- cd ..
fi
done
diff --git a/bin/update-reset-repo b/bin/update-reset-repo
new file mode 100755
index 0000000..632ef40
--- /dev/null
+++ b/bin/update-reset-repo
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+cd $1
+OUTPUT=$(git fetch -q --all && git reset -q --hard origin/master && git clean
-q -f -d 2>&1 >&-)
+CODE=$?
+
+if [ $CODE -ne 0 ]; then
+ printf "\033[31m%s failed to update\033[0m\n" "$1";
+ echo $OUTPUT;
+fi
--
To view, visit https://gerrit.wikimedia.org/r/86438
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3e9cedda3becb0b7efcc91d2033f115333c01846
Gerrit-PatchSet: 3
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
