jenkins-bot has submitted this change and it was merged.
Change subject: Update repo stuffs
......................................................................
Update repo stuffs
* Remove branch support for Mantis, defaulted to master already.
* Removed obsolete Wikia stuff
* REPO_WAYMARKEDTRAILS renamed to REPO_WAYMARKEDTRAILSSITE for consistency
* Added int-orphantalk and int-raun to Siebrand's repoconf
* Sorted EXTERNAL-PROJECTS alphabetically
* Removed wikipedia-{android,ios} from EXTERNAL-PROJECTS, other
people are taking care of those.
* Removed git projects from repocreate. Only svn and bzr projects remain.
MediaWiki stuff can probably also be removed, but leaving that for
another commit.
* Removed some $HOURS from repoexport, those are not such a big projects
needing the speedup, and there has been many weeks since last export
so I had to export all languages anyway.
* Correct alphabetical order in repoexport
* All git projects migrated to clupdate or clupdate-gerrit in repoupdate
Change-Id: Ie1f1d8ff3041e556325640acf8e94ecdbf7fec28
---
M REPOCONF
M REPOCONF.siebrand
M bin/EXTERNAL-PROJECTS
M bin/repocreate
M bin/repoexport
M bin/repoupdate
6 files changed, 52 insertions(+), 169 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/REPOCONF b/REPOCONF
index 484dffc..1196fe6 100644
--- a/REPOCONF
+++ b/REPOCONF
@@ -28,7 +28,6 @@
REPO_JQUERY_ULS=git://github.com/wikimedia/jquery.uls.git
REPO_KIWIX=git://git.code.sf.net/p/kiwix/maintenance
REPO_MANTIS=git://github.com/mantisbt/mantisbt.git
-REPO_MANTIS_BRANCH="master"
REPO_MATHJAX=git://github.com/mathjax/MathJax-i18n.git
REPO_MIFOS=git://github.com/openMF/community-app.git
REPO_NFCRINGCONTROL=git://github.com/mclear/NFC_Ring_Control.git
@@ -38,9 +37,7 @@
REPO_POTLATCH2=git://github.com/systemed/potlatch2.git
REPO_PYWIKIBOT=https://gerrit.wikimedia.org/r/pywikibot/i18n
REPO_VICUNA=git://github.com/yarl/vicuna.git
-REPO_WAYMARKEDTRAILS=git://github.com/lonvia/waymarked-trails-site.git
-REPO_WIKIA=git://github.com/Wikia/app.git
-REPO_WIKIA_BRANCH="dev"
+REPO_WAYMARKEDTRAILSSITE=git://github.com/lonvia/waymarked-trails-site.git
REPO_WIKIBLAME=git://github.com/FlominatorTM/wikiblame.git
REPO_WIKIEDUDASHBOARD=git://github.com/WikiEducationFoundation/WikiEduDashboard.git
REPO_WIKIMANIA=https://gerrit.wikimedia.org/r/wikimedia/wikimania-scholarships
diff --git a/REPOCONF.siebrand b/REPOCONF.siebrand
index 5f70c6f..f1bf70e 100644
--- a/REPOCONF.siebrand
+++ b/REPOCONF.siebrand
@@ -22,10 +22,11 @@
REPO_IHRIS_MODULES="i2ce ihris-common ihris-manage ihris-qualify ihris-train"
[email protected]:inaturalist/inaturalist.git
[email protected]:Krinkle/intuition.git
[email protected]:Krinkle/mw-tool-orphantalk.git
[email protected]:kenrick95/Raun.git
[email protected]:wikimedia/jquery.uls.git
REPO_KIWIX=ssh://[email protected]/p/kiwix/maintenance
[email protected]:mantisbt/mantisbt.git
-REPO_MANTIS_BRANCH="master"
[email protected]:mathjax/MathJax-i18n.git
[email protected]:openMF/community-app.git
[email protected]:mclear/NFC_Ring_Control.git
@@ -35,9 +36,7 @@
[email protected]:systemed/potlatch2.git
REPO_PYWIKIBOT=ssh://[email protected]:29418/pywikibot/i18n
[email protected]:yarl/vicuna.git
[email protected]:lonvia/waymarked-trails-site.git
[email protected]:Wikia/app.git
-REPO_WIKIA_BRANCH="dev"
[email protected]:lonvia/waymarked-trails-site.git
[email protected]:FlominatorTM/wikiblame.git
[email protected]:WikiEducationFoundation/WikiEduDashboard.git
REPO_WIKIMANIA=ssh://[email protected]:29418/wikimedia/wikimania-scholarships
diff --git a/bin/EXTERNAL-PROJECTS b/bin/EXTERNAL-PROJECTS
index 0848cee..e55953d 100644
--- a/bin/EXTERNAL-PROJECTS
+++ b/bin/EXTERNAL-PROJECTS
@@ -1,18 +1,17 @@
-ihris
-pywikibot
blockly
-eol
entryscape
+eol
etherpad-lite
europeana
freecol
fudforum
fuel
huggle
+ihris
inaturalist
-intuition
int-orphantalk
int-raun
+intuition
jquery.uls
kiwix
mantis
@@ -21,12 +20,11 @@
nfcring-control
nocc
osm
+pywikibot
vicuna
waymarked-trails-site
-wikiedudashboard
wikiblame
+wikiedudashboard
wikimania
-wikipedia-android
-wikipedia-ios
WikisourceMobile
WiktionaryMobile
diff --git a/bin/repocreate b/bin/repocreate
index 93afad1..654b883 100755
--- a/bin/repocreate
+++ b/bin/repocreate
@@ -25,42 +25,10 @@
fi
}
-if [ "$PROJECT" = "blockly" ]
-then
- checkVar 'REPO_BLOCKLY'
- git clone "$REPO_BLOCKLY" $PROJECT
- checkVar 'REPO_BLOCKLYGAMES'
- git clone "$REPO_BLOCKLYGAMES" blockly-games
-
-elif [ "$PROJECT" = "eol" ]
-then
- checkVar 'REPO_EOL'
- git clone "$REPO_EOL" $PROJECT
-
-elif [ "$PROJECT" = "etherpad-lite" ]
-then
- checkVar 'REPO_ETHERPADLITE'
- git clone "$REPO_ETHERPADLITE" $PROJECT --branch develop
-
-elif [ "$PROJECT" = "europeana" ]
-then
- checkVar 'REPO_EUROPEANA'
- git clone "$REPO_EUROPEANA" $PROJECT
-
-elif [ "$PROJECT" = "freecol" ]
-then
- checkVar 'REPO_FREECOL'
- git clone "$REPO_FREECOL" $PROJECT
-
-elif [ "$PROJECT" = "fudforum" ]
+if [ "$PROJECT" = "fudforum" ]
then
checkVar 'REPO_FUDFORUM'
svn checkout "$REPO_FUDFORUM" $PROJECT
-
-elif [ "$PROJECT" = "fuel" ]
-then
- checkVar 'REPO_FUEL'
- git clone "$REPO_FUEL" $PROJECT
elif [ "$PROJECT" = "ihris" ]
then
@@ -81,40 +49,6 @@
cd ..
done
-elif [ "$PROJECT" = "inaturalist" ]
-then
- checkVar 'REPO_INATURALIST'
- git clone -b i18n "$REPO_INATURALIST" $PROJECT
-
-elif [ "$PROJECT" = "intuition" ]
-then
- checkVar 'REPO_INTUITION'
- git clone "$REPO_INTUITION" $PROJECT
-
-elif [ "$PROJECT" = "jquery.uls" ]
-then
- checkVar 'REPO_JQUERY_ULS'
- git clone "$REPO_JQUERY_ULS" $PROJECT
-
-elif [ "$PROJECT" = "kiwix" ]
-then
- checkVar 'REPO_KIWIX'
- git clone "$REPO_KIWIX" $PROJECT
-
-elif [ "$PROJECT" = "mantis" ]
-then
- checkVar 'REPO_MANTIS'
- checkVar 'REPO_MANTIS_BRANCH'
- git clone "$REPO_MANTIS" $PROJECT
- cd $PROJECT
- git checkout -q --track origin/${REPO_MANTIS_BRANCH}
- cd ..
-
-elif [ "$PROJECT" = "mathjax" ]
-then
- checkVar 'REPO_MATHJAX'
- git clone "$REPO_MATHJAX" $PROJECT
-
elif [ "$PROJECT" = "mediawiki" ]
then
checkVar 'REPO_MEDIAWIKI'
@@ -133,57 +67,15 @@
then
mkdir -p $PROJECT
-elif [ "$PROJECT" = "mifos" ]
-then
- checkVar 'REPO_MIFOS'
- git clone "$REPO_MIFOS" $PROJECT
-
elif [ "$PROJECT" = "nocc" ]
then
checkVar 'REPO_NOCC'
svn checkout "$REPO_NOCC" $PROJECT
-elif [ "$PROJECT" = "nfcring-control" ]
-then
- checkVar 'REPO_NFCRINGCONTROL'
- git clone "$REPO_NFCRINGCONTROL" $PROJECT
-
elif [ "$PROJECT" = "openimages" ]
then
checkVar 'REPO_OPENIMAGES'
svn checkout "$REPO_OPENIMAGES" $PROJECT
-
-elif [ "$PROJECT" = "osm" ]
-then
- checkVar 'REPO_OSM'
- checkVar 'REPO_POTLATCH2'
- git clone "$REPO_OSM" $PROJECT
- git clone "$REPO_POTLATCH2" potlatch2
-
-elif [ "$PROJECT" = "pywikibot" ]
-then
- checkVar 'REPO_PYWIKIBOT'
- "$CLUPDATE_GERRIT" "$REPO_PYWIKIBOT" "$DIR/$PROJECT"
-
-elif [ "$PROJECT" = "vicuna" ]
-then
- checkVar 'REPO_VICUNA'
- git clone "$REPO_VICUNA" $PROJECT
-
-elif [ "$PROJECT" = "waymarked-trails-site" ]
-then
- checkVar 'REPO_WAYMARKEDTRAILS'
- git clone "$REPO_WAYMARKEDTRAILS" $PROJECT
-
-elif [ "$PROJECT" = "wikiblame" ]
-then
- checkVar 'REPO_WIKIBLAME'
- git clone "$REPO_WIKIBLAME" $PROJECT
-
-elif [ "$PROJECT" = "wikimania" ]
-then
- checkVar 'REPO_WIKIMANIA'
- "$CLUPDATE_GERRIT" "$REPO_WIKIMANIA" "$DIR/$PROJECT"
else
echo "`basename $0`: Unknown project"
diff --git a/bin/repoexport b/bin/repoexport
index 7a15bf4..6410cea 100755
--- a/bin/repoexport
+++ b/bin/repoexport
@@ -74,15 +74,15 @@
elif [ "$PROJECT" = "intuition" ]
then
- php "$EXPORTER" --target . --group=tsint* --lang='*' --skip
"$SKIPLANGS" $HOURS
+ php "$EXPORTER" --target . --group=tsint* --lang='*' --skip "$SKIPLANGS"
elif [ "$PROJECT" = "int-orphantalk" ]
then
- php "$EXPORTER" --target . --group=int-orphantalk --lang='*' --skip
"$SKIPLANGS" $HOURS
+ php "$EXPORTER" --target . --group=int-orphantalk --lang='*' --skip
"$SKIPLANGS"
elif [ "$PROJECT" = "int-raun" ]
then
- php "$EXPORTER" --target . --group=int-raun --lang='*' --skip
"$SKIPLANGS" $HOURS
+ php "$EXPORTER" --target . --group=int-raun --lang='*' --skip
"$SKIPLANGS"
elif [ "$PROJECT" = "jquery.uls" ]
then
@@ -138,14 +138,14 @@
php "$EXPORTER" --target . --group='out-mifos' --lang='*' --skip en,qqq
--threshold 20
php "$EXPORTER" --target . --group='out-mifos' --lang qqq
+elif [ "$PROJECT" = "nfcring-control" ]
+then
+ php "$EXPORTER" --target . --group=out-$PROJECT --lang='*' --skip
en,qqq $THRESHOLD
+
elif [ "$PROJECT" = "nocc" ]
then
php "$EXPORTER" --target . --group=out-nocc-* --lang='*' --skip en,qqq
$THRESHOLD
php "$EXPORTER" --target . --group=out-nocc-* --lang qqq
-
-elif [ "$PROJECT" = "nfcring-control" ]
-then
- php "$EXPORTER" --target . --group=out-$PROJECT --lang='*' --skip
en,qqq $THRESHOLD
elif [ "$PROJECT" = "okawix" ]
then
diff --git a/bin/repoupdate b/bin/repoupdate
index f28f997..9e79b63 100755
--- a/bin/repoupdate
+++ b/bin/repoupdate
@@ -19,8 +19,14 @@
fi
}
-gitupdate() {
- "$DIRSCRIPT/update-reset-repo" "$DIR/$1" "" "${2:-master}"
+doUpdate() {
+ VAR="${1^^}"
+ VAR="${VAR//-}"
+ VAR="${VAR//./_}"
+ VAR="REPO_$VAR"
+ checkVar "$VAR"
+ "$2" "${!VAR}" "$DIR/$1" "${3:-}"
+ exit 0
}
processGroups() {
@@ -47,36 +53,25 @@
else CLUPDATE_GERRIT="$DIRSCRIPT/clupdate-git-repo";
fi
-GITUPDATEPROJECTS="\
+GITCLUPDATE="\
+crosswatch \
+entryscape \
eol \
europeana \
freecol \
fuel \
+huggle \
intuition \
+int-orphantalk \
+int-raun \
jquery.uls \
kiwix \
-mathjax
+mantis \
+mathjax \
nfcring-control \
-pywikibot \
vicuna \
waymarked-trails-site \
wikiblame \
-wikimania"
-
-for i in $GITUPDATEPROJECTS; do
- if [ "$i" = "$PROJECT" ]
- then
- gitupdate "$PROJECT"
- exit 0
- fi
-done
-
-GITCLUPDATE="\
-crosswatch \
-entryscape \
-huggle \
-int-orphantalk \
-int-raun \
wikiedudashboard \
wikipedia-android \
wikipedia-ios \
@@ -86,23 +81,29 @@
for i in $GITCLUPDATE; do
if [ "$i" = "$PROJECT" ]
then
- VAR="${PROJECT^^}"
- VAR="${VAR//-}"
- VAR="REPO_$VAR"
- checkVar "$VAR"
- "$CLUPDATE" "${!VAR}" "$DIR/$PROJECT"
- exit 0
+ doUpdate "$PROJECT" "$CLUPDATE"
+ fi
+done
+
+GITCLUPDATE_GERRIT="\
+pywikibot \
+wikimania"
+
+for i in $GITCLUPDATE_GERRIT; do
+ if [ "$i" = "$PROJECT" ]
+ then
+ doUpdate "$PROJECT" "$CLUPDATE_GERRIT"
fi
done
if [ "$PROJECT" = "blockly" ]
then
- gitupdate "$PROJECT"
- gitupdate "blockly-games"
+ doUpdate "blockly" "$CLUPDATE"
+ doUpdate "blockly-games" "$CLUPDATE"
elif [ "$PROJECT" = "etherpad-lite" ]
then
- gitupdate "$PROJECT" $REPO_ETHERPADLITE_BRANCH
+ doUpdate "$PROJECT" "$CLUPDATE" $REPO_ETHERPADLITE_BRANCH
elif [ "$PROJECT" = "fudforum" ]
then
@@ -120,15 +121,11 @@
elif [ "$PROJECT" = "inaturalist" ]
then
- gitupdate "$PROJECT" i18n
-
-elif [ "$PROJECT" = "mantis" ]
-then
- gitupdate "$PROJECT" $REPO_MANTIS_BRANCH
+ doUpdate "$PROJECT" "$CLUPDATE" i18n
elif [ "$PROJECT" = "mifos" ]
then
- gitupdate "$PROJECT" develop
+ doUpdate "$PROJECT" "$CLUPDATE" develop
elif [ "$PROJECT" = "mediawiki" ]
then
@@ -175,8 +172,8 @@
elif [ "$PROJECT" = "osm" ]
then
- gitupdate "$PROJECT"
- gitupdate "potlatch2"
+ doUpdate "$PROJECT" "$CLUPDATE"
+ doUpdate "potlatch2" "$CLUPDATE"
else
echo "`basename $0`: Unknown project"
--
To view, visit https://gerrit.wikimedia.org/r/261348
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1f1d8ff3041e556325640acf8e94ecdbf7fec28
Gerrit-PatchSet: 2
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
