jenkins-bot has submitted this change and it was merged. Change subject: Move Wikipedia apps for Android and iOS to RepoNG ......................................................................
Move Wikipedia apps for Android and iOS to RepoNG • Move Wikipedia apps for Android and iOS to RepoNg. • Update Wikipedia for iOS branch from master to develop. • Update Wikipedia for Android to use Phabricator repo since Diffusion is the future. Change-Id: I2b0f039c0a442bece45079676e489c735c6d70d9 --- 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, 44 insertions(+), 24 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/REPOCONF b/REPOCONF index 4f7139d..d9ff470 100644 --- a/REPOCONF +++ b/REPOCONF @@ -38,5 +38,3 @@ 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 -REPO_WIKIPEDIAANDROID=https://gerrit.wikimedia.org/r/apps/android/wikipedia -REPO_WIKIPEDIAIOS=git://github.com/wikimedia/wikipedia-ios.git diff --git a/REPOCONF.commit b/REPOCONF.commit index 43b790a..93e7299 100644 --- a/REPOCONF.commit +++ b/REPOCONF.commit @@ -14,10 +14,6 @@ REPO_MWEXTGIT=ssh://l10n-...@gerrit.wikimedia.org:29418/mediawiki/extensions REPO_MWSKINGIT=ssh://l10n-...@gerrit.wikimedia.org:29418/mediawiki/skins -# mobile stuffs -REPO_WIKIPEDIAANDROID=ssh://l10n-...@gerrit.wikimedia.org:29418/apps/android/wikipedia -REPO_WIKIPEDIAIOS=g...@github.com:wikimedia/wikipedia-ios.git - # other REPO_CROSSWATCH=ssh://l10n-...@gerrit.wikimedia.org:29418/labs/tools/crosswatch REPO_EOL=g...@github.com:EOL/eol.git diff --git a/bin/REPONG-PROJECTS b/bin/REPONG-PROJECTS index 7e46748..31e665f 100644 --- a/bin/REPONG-PROJECTS +++ b/bin/REPONG-PROJECTS @@ -6,3 +6,5 @@ inaturalist pageviews wiki-ai +wikipedia-android +wikipedia-ios diff --git a/bin/repocommit b/bin/repocommit index 9d96120..d821380 100755 --- a/bin/repocommit +++ b/bin/repocommit @@ -55,8 +55,7 @@ vicuna \ waymarked-trails-site \ wikiblame \ -wikiedudashboard \ -wikipedia-ios" +wikiedudashboard" for i in $GITPROJECTS; do if [ "$i" = "$PROJECT" ] @@ -77,8 +76,7 @@ crosswatch \ int-dcatap \ pywikibot \ -wikimania \ -wikipedia-android" +wikimania" for i in $GERRITPROJECTS; do if [ "$i" = "$PROJECT" ] diff --git a/bin/repoexport b/bin/repoexport index 93e24cb..9e4b08e 100755 --- a/bin/repoexport +++ b/bin/repoexport @@ -189,16 +189,6 @@ php "$EXPORTER" --target . --group=out-wikimania-scholarships-app --lang='*' --skip en,qqq $THRESHOLD php "$EXPORTER" --target . --group=out-wikimania-scholarships-app --lang qqq -elif [ "$PROJECT" = "wikipedia-android" ] -then - php "$EXPORTER" --target . --group=out-wikimedia-mobile-wikipedia-android* --lang='*' --skip en,qqq $THRESHOLD - php "$EXPORTER" --target . --group=out-wikimedia-mobile-wikipedia-android* --lang qqq - -elif [ "$PROJECT" = "wikipedia-ios" ] -then - php "$EXPORTER" --target . --group=out-wikimedia-mobile-wikipedia-ios* --lang='*' --skip en,qqq $THRESHOLD - php "$EXPORTER" --target . --group=out-wikimedia-mobile-wikipedia-ios* --lang qqq - else echo "`basename $0`: Unknown project" exit 1 diff --git a/bin/repoupdate b/bin/repoupdate index 2460c41..8be4d22 100755 --- a/bin/repoupdate +++ b/bin/repoupdate @@ -63,8 +63,7 @@ vicuna \ waymarked-trails-site \ wikiblame \ -wikiedudashboard \ -wikipedia-ios" +wikiedudashboard" for i in $GITCLUPDATE; do if [ "$i" = "$PROJECT" ] @@ -77,8 +76,7 @@ crosswatch \ int-dcatap \ pywikibot \ -wikimania \ -wikipedia-android" +wikimania" for i in $GITCLUPDATE_GERRIT; do if [ "$i" = "$PROJECT" ] diff --git a/repoconfig.commit.json b/repoconfig.commit.json index 77cc4b8..c9556e3 100644 --- a/repoconfig.commit.json +++ b/repoconfig.commit.json @@ -102,5 +102,24 @@ "url": "g...@github.com:wiki-ai/wikilabels-wikimedia-config.git" } } + }, + "wikipedia-android": { + "group": "out-wikimedia-mobile-wikipedia-android-*", + "repos": { + "wikipedia-android": { + "type": "git", + "url": "https://phabricator.wikimedia.org/diffusion/APAW"; + } + } + }, + "wikipedia-ios": { + "group": "out-wikimedia-mobile-wikipedia-ios", + "repos": { + "wikipedia-ios": { + "type": "git", + "branch": "develop", + "url": "git://github.com/wikimedia/wikipedia-ios.git" + } + } } } diff --git a/repoconfig.json b/repoconfig.json index e09b4f1..47ff082 100644 --- a/repoconfig.json +++ b/repoconfig.json @@ -102,5 +102,24 @@ "url": "https://github.com/wiki-ai/wikilabels-wikimedia-config.git"; } } + }, + "wikipedia-android": { + "group": "out-wikimedia-mobile-wikipedia-android-*", + "repos": { + "wikipedia-android": { + "type": "git", + "url": "https://phabricator.wikimedia.org/diffusion/APAW"; + } + } + }, + "wikipedia-ios": { + "group": "out-wikimedia-mobile-wikipedia-ios", + "repos": { + "wikipedia-ios": { + "type": "git", + "branch": "develop", + "url": "git://github.com/wikimedia/wikipedia-ios.git" + } + } } } -- To view, visit https://gerrit.wikimedia.org/r/276347 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2b0f039c0a442bece45079676e489c735c6d70d9 Gerrit-PatchSet: 8 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org> Gerrit-Reviewer: Fjalapeno <cfl...@wikimedia.org> Gerrit-Reviewer: Mhurd <mh...@wikimedia.org> Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org> Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com> Gerrit-Reviewer: Siebrand <siebr...@kitano.nl> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
