jenkins-bot has submitted this change and it was merged. Change subject: Remove support for Commons Android/iOS apps ......................................................................
Remove support for Commons Android/iOS apps They are unsupported since 2013 and were retired today: http://thread.gmane.org/gmane.org.wikimedia.mobile/2885/focus=2940 Change-Id: I65346334808669e81e2555f337ee0d078820d2df --- M REPOCONF M REPOCONF.siebrand M bin/EXTERNAL-PROJECTS M bin/repocommit M bin/repocreate M bin/repoexport M bin/repoupdate M groups/Wikimedia/WikimediaMobile-android.yaml M groups/Wikimedia/WikimediaMobile-ios.yaml M groups/Wikimedia/WikimediaMobile.yaml 10 files changed, 12 insertions(+), 113 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/REPOCONF b/REPOCONF index 741f67b..846d1c8 100644 --- a/REPOCONF +++ b/REPOCONF @@ -7,8 +7,6 @@ REPO_MWSKINGIT=https://gerrit.wikimedia.org/r/p/mediawiki/skins REPO_BLOCKLY=http://blockly.googlecode.com/svn/trunk/ -REPO_COMMONSANDROID=https://gerrit.wikimedia.org/r/p/apps/android/commons.git -REPO_COMMONSIOS=https://gerrit.wikimedia.org/r/p/apps/ios/commons.git REPO_EOL=git://github.com/EOL/eol.git REPO_ETHERPADLITE=git://github.com/ether/etherpad-lite.git REPO_ETHERPADLITE_BRANCH="develop" diff --git a/REPOCONF.siebrand b/REPOCONF.siebrand index 2a22711..f43ced4 100644 --- a/REPOCONF.siebrand +++ b/REPOCONF.siebrand @@ -7,8 +7,6 @@ REPO_MWSKINGIT=ssh://l10n-...@gerrit.wikimedia.org:29418/mediawiki/skins REPO_BLOCKLY=https://blockly.googlecode.com/svn/trunk/ -REPO_COMMONSANDROID=ssh://l10n-...@gerrit.wikimedia.org:29418/apps/android/commons.git -REPO_COMMONSIOS=ssh://l10n-...@gerrit.wikimedia.org:29418/apps/ios/commons.git REPO_EOL=g...@github.com:EOL/eol.git REPO_ETHERPADLITE=g...@github.com:ether/etherpad-lite.git REPO_ETHERPADLITE_BRANCH="develop" diff --git a/bin/EXTERNAL-PROJECTS b/bin/EXTERNAL-PROJECTS index 3934b06..24cc105 100644 --- a/bin/EXTERNAL-PROJECTS +++ b/bin/EXTERNAL-PROJECTS @@ -2,8 +2,6 @@ ihris pywikibot blockly -commons-android -commons-ios eol etherpad-lite europeana diff --git a/bin/repocommit b/bin/repocommit index 713f257..28cca10 100755 --- a/bin/repocommit +++ b/bin/repocommit @@ -81,8 +81,6 @@ # TODO: Move to separate file? GERRITPROJECTS="\ -commons-android \ -commons-ios \ pywikibot \ wikimania \ wikipedia-android \ diff --git a/bin/repocreate b/bin/repocreate index 23bea9f..86cc5e7 100755 --- a/bin/repocreate +++ b/bin/repocreate @@ -31,19 +31,7 @@ fi } -if [ "$PROJECT" = "commons-android" ] -then - checkVar 'REPO_COMMONSANDROID' - git clone "$REPO_COMMONSANDROID" $PROJECT - gitCreateGerrit $PROJECT - -elif [ "$PROJECT" = "commons-ios" ] -then - checkVar 'REPO_COMMONSIOS' - git clone "$REPO_COMMONSIOS" $PROJECT - gitCreateGerrit $PROJECT - -elif [ "$PROJECT" = "blockly" ] +if [ "$PROJECT" = "blockly" ] then checkVar 'REPO_BLOCKLY' svn checkout "$REPO_BLOCKLY" $PROJECT diff --git a/bin/repoexport b/bin/repoexport index e785c0e..55232f1 100755 --- a/bin/repoexport +++ b/bin/repoexport @@ -20,17 +20,7 @@ THRESHOLD="--threshold 35" HOURS="--hours 200" # Somewhat over a week -if [ "$PROJECT" = "commons-android" ] -then - php "$EXPORTER" --target . --group=out-wikimedia-mobile-commons-android* --lang='*' --skip en,qqq $THRESHOLD - php "$EXPORTER" --target . --group=out-wikimedia-mobile-commons-android* --lang qqq - -elif [ "$PROJECT" = "commons-ios" ] -then - php "$EXPORTER" --target . --group=out-wikimedia-mobile-commons-ios* --lang='*' --skip en,qqq $THRESHOLD - php "$EXPORTER" --target . --group=out-wikimedia-mobile-commons-ios* --lang qqq - -elif [ "$PROJECT" = "blockly" ] +if [ "$PROJECT" = "blockly" ] then php "$EXPORTER" --target . --group=out-blockly* --lang='*' --skip en $THRESHOLD diff --git a/bin/repoupdate b/bin/repoupdate index 5ab9c2a..d87b85c 100755 --- a/bin/repoupdate +++ b/bin/repoupdate @@ -72,8 +72,6 @@ } GITUPDATEPROJECTS="\ -commons-android \ -commons-ios \ eol \ europeana \ freecol \ diff --git a/groups/Wikimedia/WikimediaMobile-android.yaml b/groups/Wikimedia/WikimediaMobile-android.yaml index f2bfec5..0c2e65f 100644 --- a/groups/Wikimedia/WikimediaMobile-android.yaml +++ b/groups/Wikimedia/WikimediaMobile-android.yaml @@ -1,7 +1,7 @@ TEMPLATE: BASIC: - description: "{{int:translate-group-desc-wikimedia-mobile-commons}}" - icon: wiki://Commons-icon.svg + description: "{{int:translate-group-desc-wikimedia-mobile-wikipedia-android}}" + icon: wiki://Wikimedia-logo.svg namespace: NS_WIKIMEDIA class: FileBasedMessageGroup @@ -204,45 +204,6 @@ - zu --- BASIC: - id: out-wikimedia-mobile-commons-android-0-all - label: Commons Mobile App - meta: yes - class: AggregateMessageGroup - -GROUPS: - - out-wikimedia-mobile-commons-* - ---- -BASIC: - id: out-wikimedia-mobile-commons-android-strings - label: Commons Android Mobile (main) - -MANGLER: - prefix: commons-android-strings- - -FILES: - sourcePattern: "%GROUPROOT%/commons-android/commons/res/values-%CODE%/strings.xml" - definitionFile: "%GROUPROOT%/commons-android/commons/res/values/strings.xml" - -TAGS: - optional: - - commons-android-strings-hello_world - ---- -BASIC: - id: out-wikimedia-mobile-commons-android-errors - label: Commons Android Mobile (errors) - -MANGLER: - prefix: commons-android-error- - -FILES: - sourcePattern: "%GROUPROOT%/commons-android/commons/res/values-%CODE%/error.xml" - definitionFile: "%GROUPROOT%/commons-android/commons/res/values/error.xml" - ---- -BASIC: - description: "{{int:translate-group-desc-wikimedia-mobile-wikipedia-android}}" icon: wiki://Wikipedia-logo-v2.svg id: out-wikimedia-mobile-wikipedia-android-strings label: Wikipedia Android Mobile diff --git a/groups/Wikimedia/WikimediaMobile-ios.yaml b/groups/Wikimedia/WikimediaMobile-ios.yaml index 4304e8e..27e5405 100644 --- a/groups/Wikimedia/WikimediaMobile-ios.yaml +++ b/groups/Wikimedia/WikimediaMobile-ios.yaml @@ -1,36 +1,21 @@ ---- -BASIC: - description: "{{int:translate-group-desc-wikimedia-mobile-commons}}" - icon: wiki://Commons-icon.svg - namespace: NS_WIKIMEDIA - id: out-wikimedia-mobile-commons-ios - label: Commons iOS Mobile - class: FileBasedMessageGroup +TEMPLATE: + BASIC: + description: "{{int:translate-group-desc-wikimedia-mobile-wikipedia-ios}}" + icon: wiki://Wikimedia-logo.svg + namespace: NS_WIKIMEDIA + class: FileBasedMessageGroup -MANGLER: - class: StringMatcher - prefix: commons-ios- - patterns: - - "*" - -FILES: - class: JsonFFS - sourcePattern: "%GROUPROOT%/commons-ios/Commons-iOS/messages/messages-%CODE%.json" + MANGLER: + class: StringMatcher --- BASIC: - description: "{{int:translate-group-desc-wikimedia-mobile-wikipedia-ios}}" icon: wiki://Wikipedia-logo-v2.svg - namespace: NS_WIKIMEDIA id: out-wikimedia-mobile-wikipedia-ios label: Wikipedia iOS Mobile main - class: FileBasedMessageGroup MANGLER: - class: StringMatcher prefix: wikipedia-ios- - patterns: - - "*" FILES: class: AppleFFS @@ -38,18 +23,12 @@ --- BASIC: - description: "{{int:translate-group-desc-wikimedia-mobile-wikipedia-ios}}" icon: wiki://Wikipedia-logo-v2.svg - namespace: NS_WIKIMEDIA id: out-wikimedia-mobile-wikipedia-ios-meta label: Wikipedia iOS Mobile metadata - class: FileBasedMessageGroup MANGLER: - class: StringMatcher prefix: wikipedia-ios-meta- - patterns: - - "*" FILES: class: AppleFFS @@ -57,18 +36,12 @@ --- BASIC: - description: "{{int:translate-group-desc-wikimedia-mobile-wikipedia-ios}}" icon: wiki://Wikipedia-logo-v2.svg - namespace: NS_WIKIMEDIA id: out-wikimedia-mobile-wikipedia-ios-ui label: Wikipedia iOS Mobile UI strings - class: FileBasedMessageGroup MANGLER: - class: StringMatcher prefix: wikipedia-ios-ui- - patterns: - - "*" FILES: class: AppleFFS @@ -91,9 +64,7 @@ --- BASIC: - description: "{{int:translate-group-desc-wikimedia-mobile-wikipedia-ios}}" icon: wiki://Wikipedia-logo-v2.svg - namespace: NS_WIKIMEDIA id: out-wikimedia-mobile-wikipedia-ios-0-all label: Wikipedia iOS Mobile meta: yes diff --git a/groups/Wikimedia/WikimediaMobile.yaml b/groups/Wikimedia/WikimediaMobile.yaml index 2d3f949..ac75a91 100644 --- a/groups/Wikimedia/WikimediaMobile.yaml +++ b/groups/Wikimedia/WikimediaMobile.yaml @@ -18,7 +18,6 @@ class: AggregateMessageGroup GROUPS: - - out-wikimedia-mobile-commons-android-0-all - out-wikimedia-mobile-wikipedia-android-strings - out-wikimedia-mobile-wikipedia-ios-0-all - out-wikimedia-mobile-wikipedia-j2me -- To view, visit https://gerrit.wikimedia.org/r/160831 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I65346334808669e81e2555f337ee0d078820d2df Gerrit-PatchSet: 9 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nemo bis <federicol...@tiscali.it> Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org> Gerrit-Reviewer: Deskana <dga...@wikimedia.org> Gerrit-Reviewer: Nemo bis <federicol...@tiscali.it> 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
