jenkins-bot has submitted this change and it was merged.
Change subject: Fixing some bugs in repoupdate
......................................................................
Fixing some bugs in repoupdate
* mediawiki core was broken
* WikibaseRepository breaking extensions
* Fix gerrit urls for oojs-ui and VisualEditor
* Some extensions like Collection were listed multiple times because
they have subrepos, now ignored properly.
Change-Id: Ie72955cf333f34674937812730ae613a04b7720e
---
M bin/repoupdate
1 file changed, 8 insertions(+), 5 deletions(-)
Approvals:
Raimond Spekking: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/repoupdate b/bin/repoupdate
index 891cdd5..b71fb42 100755
--- a/bin/repoupdate
+++ b/bin/repoupdate
@@ -32,11 +32,14 @@
fi
}
+# Ignore subrepos like Collection/OfflineContentGenerator
fetchReposFromGerrit() {
curl -s "https://gerrit.wikimedia.org/r/projects/?p=$1"; |
grep "$1" |
cut -d '"' -f2 |
- cut -d '/' -f3 |
+ cut -d '/' -f3- |
+ grep -v '/' |
+ grep -v 'WikibaseRepository' | # T102453
sort
}
@@ -131,7 +134,7 @@
fi
echo "$REPO_MEDIAWIKI_BRANCHES" | tr ' ' '\n' |
- xargs -P4 I___ "$CLUPDATE_GERRIT" "$REPO_MEDIAWIKI"
"$DIR/$PROJECT/___" "___"
+ xargs -P4 -I___ "$CLUPDATE_GERRIT" "$REPO_MEDIAWIKI"
"$DIR/$PROJECT/___" "___"
elif [ "$PROJECT" = "mediawiki-extensions" ]
then
@@ -142,9 +145,9 @@
echo "$(fetchReposFromGerrit mediawiki/extensions/)" |
xargs -P4 -I___ "$CLUPDATE_GERRIT" "$REPO_MWEXTGIT/___.git"
"$DIR/$PROJECT/extensions/___"
- "$CLUPDATE_GERRIT" "https://gerrit.wikimedia.org/r/p/oojs/ui.git";
"$DIR/$PROJECT/extensions/oojs-ui" &
- "$CLUPDATE_GERRIT"
"https://gerrit.wikimedia.org/r/p/VisualEditor/VisualEditor.git";
"$DIR/$PROJECT/extensions/VisualEditorVisualEditor" &
- wait
+ REPOPREFIX="${REPO_MWEXTGIT%/mediawiki/extensions}"
+ "$CLUPDATE_GERRIT" "$REPOPREFIX/oojs/ui.git"
"$DIR/$PROJECT/extensions/oojs-ui"
+ "$CLUPDATE_GERRIT" "$REPOPREFIX/VisualEditor/VisualEditor.git"
"$DIR/$PROJECT/extensions/VisualEditorVisualEditor"
processGroups "ext-*"
--
To view, visit https://gerrit.wikimedia.org/r/218295
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie72955cf333f34674937812730ae613a04b7720e
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
Gerrit-Reviewer: Raimond Spekking <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
