Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/290195
Change subject: Migrate DCAT-AP, Pywikibot and Wikimania Scholarships to repong ...................................................................... Migrate DCAT-AP, Pywikibot and Wikimania Scholarships to repong Change-Id: I360c720a9fa7ab30494cd114e603562ee8d1586f --- M REPOCONF M REPOCONF.commit M bin/REPONG-PROJECTS M bin/repocommit M bin/repoexport M bin/repoupdate M repoconfig.commit.json M repoconfig.json 8 files changed, 59 insertions(+), 47 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/95/290195/1 diff --git a/REPOCONF b/REPOCONF index ea5f0b8..00b0dd8 100644 --- a/REPOCONF +++ b/REPOCONF @@ -15,7 +15,6 @@ REPO_IHRIS_BRANCH="4.2-dev" REPO_IHRIS_MODULES="i2ce ihris-common ihris-manage ihris-qualify ihris-train" REPO_INTUITION=https://github.com/Krinkle/intuition.git -REPO_INTDCATAP=https://gerrit.wikimedia.org/r/operations/dumps/dcat REPO_INTORPHANTALK=https://github.com/Krinkle/mw-tool-orphantalk.git REPO_INTRAUN=https://github.com/kenrick95/Raun.git REPO_INTREFILL=https://github.com/zhaofengli/refill.git @@ -28,9 +27,7 @@ REPO_NOCC=https://svn.code.sf.net/p/nocc/code/trunk REPO_OSM=git://git.openstreetmap.org/rails.git REPO_POTLATCH2=https://github.com/systemed/potlatch2.git -REPO_PYWIKIBOT=https://gerrit.wikimedia.org/r/pywikibot/i18n REPO_VICUNA=https://github.com/yarl/vicuna.git REPO_WAYMARKEDTRAILSSITE=https://github.com/lonvia/waymarked-trails-site.git REPO_WIKIBLAME=https://github.com/FlominatorTM/wikiblame.git REPO_WIKIEDUDASHBOARD=https://github.com/WikiEducationFoundation/WikiEduDashboard.git -REPO_WIKIMANIA=https://gerrit.wikimedia.org/r/wikimedia/wikimania-scholarships diff --git a/REPOCONF.commit b/REPOCONF.commit index ad51fcf..3681dde 100644 --- a/REPOCONF.commit +++ b/REPOCONF.commit @@ -23,7 +23,6 @@ REPO_IHRIS=http://bazaar.launchpad.net/~intrahealth%2Binformatics REPO_IHRIS_BRANCH="4.2" REPO_IHRIS_MODULES="i2ce ihris-common ihris-manage ihris-qualify ihris-train" -REPO_INTDCATAP=ssh://l10n-...@gerrit.wikimedia.org:29418/operations/dumps/dcat REPO_INTUITION=g...@github.com:Krinkle/intuition.git REPO_INTORPHANTALK=g...@github.com:Krinkle/mw-tool-orphantalk.git REPO_INTRAUN=g...@github.com:kenrick95/Raun.git @@ -37,9 +36,7 @@ REPO_NOCC=svn+ssh://${THISUSER}@svn.code.sf.net/p/nocc/code/trunk REPO_OSM=ssh://translatew...@git.openstreetmap.org/var/lib/git/rails.git REPO_POTLATCH2=g...@github.com:systemed/potlatch2.git -REPO_PYWIKIBOT=ssh://l10n-...@gerrit.wikimedia.org:29418/pywikibot/i18n REPO_VICUNA=g...@github.com:yarl/vicuna.git REPO_WAYMARKEDTRAILSSITE=g...@github.com:lonvia/waymarked-trails-site.git REPO_WIKIBLAME=g...@github.com:FlominatorTM/wikiblame.git REPO_WIKIEDUDASHBOARD=g...@github.com:WikiEducationFoundation/WikiEduDashboard.git -REPO_WIKIMANIA=ssh://l10n-...@gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships diff --git a/bin/REPONG-PROJECTS b/bin/REPONG-PROJECTS index 91ff82c..07b47bd 100644 --- a/bin/REPONG-PROJECTS +++ b/bin/REPONG-PROJECTS @@ -2,6 +2,7 @@ citationhunt codev crosswatch +int-dcatap entryscape etherpad-lite europeana @@ -10,7 +11,9 @@ mwgerrit mwgithub pageviews +pywikibot wiki-ai wikidata +wikimania wikipedia-android wikipedia-ios diff --git a/bin/repocommit b/bin/repocommit index 3a8cac7..0befeff 100755 --- a/bin/repocommit +++ b/bin/repocommit @@ -70,21 +70,6 @@ fi done -# TODO: Move to separate file? -GERRITPROJECTS="\ -int-dcatap \ -pywikibot \ -wikimania" - -for i in $GERRITPROJECTS; do - if [ "$i" = "$PROJECT" ] - then - gitCommitGerrit "$DIR/$PROJECT" - mergeL10n-bot - exit 0 - fi -done - REPONG=$(cat "$DIRSCRIPT/REPONG-PROJECTS"); for i in $REPONG; do if [ "$i" = "$PROJECT" ] diff --git a/bin/repoexport b/bin/repoexport index a247205..4236562 100755 --- a/bin/repoexport +++ b/bin/repoexport @@ -59,10 +59,6 @@ then php "$EXPORTER" --target . --group=tsint* --lang='*' --skip "$SKIPLANGS" -elif [ "$PROJECT" = "int-dcatap" ] -then - php "$EXPORTER" --target . --group=int-dcatap --lang='*' --skip "$SKIPLANGS" - elif [ "$PROJECT" = "int-orphantalk" ] then php "$EXPORTER" --target . --group=int-orphantalk --lang='*' --skip "$SKIPLANGS" @@ -147,10 +143,6 @@ then php "$EXPORTER" --target . --group=out-osm-* --lang='*' --skip en,qqq $THRESHOLD -elif [ "$PROJECT" = "pywikibot" ] -then - php "$EXPORTER" --target . --group=out-pywikipedia* --lang='*' --skip en --threshold 1 - elif [ "$PROJECT" = "vicuna" ] then php "$EXPORTER" --target . --group=out-vicuna --lang='*' --skip en,qqq $THRESHOLD @@ -170,11 +162,6 @@ elif [ "$PROJECT" = "wikiedudashboard" ] then php "$EXPORTER" --target . --group=wikiedudashboard --lang='*' --skip en - -elif [ "$PROJECT" = "wikimania" ] -then - php "$EXPORTER" --target . --group=out-wikimania-scholarships-app --lang='*' --skip en,qqq $THRESHOLD - php "$EXPORTER" --target . --group=out-wikimania-scholarships-app --lang qqq else echo "`basename $0`: Unknown project" diff --git a/bin/repoupdate b/bin/repoupdate index a3cebed..2156d1e 100755 --- a/bin/repoupdate +++ b/bin/repoupdate @@ -71,18 +71,6 @@ fi done -GITCLUPDATE_GERRIT="\ -int-dcatap \ -pywikibot \ -wikimania" - -for i in $GITCLUPDATE_GERRIT; do - if [ "$i" = "$PROJECT" ] - then - doUpdate "$PROJECT" "$CLUPDATE_GERRIT" - fi -done - REPONG=$(cat "$DIRSCRIPT/REPONG-PROJECTS"); for i in $REPONG; do if [ "$i" = "$PROJECT" ] diff --git a/repoconfig.commit.json b/repoconfig.commit.json index 5581ba2..379cea7 100644 --- a/repoconfig.commit.json +++ b/repoconfig.commit.json @@ -42,6 +42,15 @@ } } }, + "int-dcatap": { + "group": "int-dcatap", + "repos": { + "int-dcatap": { + "type": "wmgerrit", + "url": "ssh://l10n-...@gerrit.wikimedia.org:29418/operations/dumps/dcat" + } + } + }, "entryscape": { "group": "entryscape-*", "repos": { @@ -63,7 +72,6 @@ }, "europeana": { "group": "out-europeana", - "export-threshold": 75, "repos": { "europeana": { "type": "git", @@ -116,6 +124,16 @@ "pageviews": { "type": "git", "url": "g...@github.com:MusikAnimal/pageviews.git" + } + } + }, + "pywikibot": { + "group": "out-pageviews", + "export-threshold": 1, + "repos": { + "pywikibot": { + "type": "wmgerrit", + "url": "ssh://l10n-...@gerrit.wikimedia.org:29418/pywikibot/i18n" } } }, @@ -256,6 +274,15 @@ } } }, + "wikimania": { + "group": "out-wikimania-scholarships-app", + "repos": { + "wikimania": { + "type": "wmgerrit", + "url": "ssh://l10n-...@gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships" + } + } + }, "wikipedia-ios": { "group": "out-wikimedia-mobile-wikipedia-ios", "repos": { diff --git a/repoconfig.json b/repoconfig.json index 4e00bf0..1c86d29 100644 --- a/repoconfig.json +++ b/repoconfig.json @@ -42,6 +42,15 @@ } } }, + "int-dcatap": { + "group": "int-dcatap", + "repos": { + "int-dcatap": { + "type": "wmgerrit", + "url": "https://gerrit.wikimedia.org/r/operations/dumps/dcat"; + } + } + }, "entryscape": { "group": "entryscape-*", "repos": { @@ -116,6 +125,16 @@ "pageviews": { "type": "git", "url": "https://github.com/MusikAnimal/pageviews.git"; + } + } + }, + "pywikibot": { + "group": "out-pageviews", + "export-threshold": 1, + "repos": { + "pywikibot": { + "type": "wmgerrit", + "url": "https://gerrit.wikimedia.org/r/pywikibot/i18n"; } } }, @@ -256,6 +275,15 @@ } } }, + "wikimania": { + "group": "out-wikimania-scholarships-app", + "repos": { + "wikimania": { + "type": "wmgerrit", + "url": "https://gerrit.wikimedia.org/r/wikimedia/wikimania-scholarships"; + } + } + }, "wikipedia-ios": { "group": "out-wikimedia-mobile-wikipedia-ios", "repos": { -- To view, visit https://gerrit.wikimedia.org/r/290195 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I360c720a9fa7ab30494cd114e603562ee8d1586f Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand <siebr...@kitano.nl> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
