[MediaWiki-commits] [Gerrit] VisualEditor and OO JS groups now use repong - change (translatewiki)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/281308 Change subject: VisualEditor and OO JS groups now use repong .. VisualEditor and OO JS groups now use repong Added to the project wmgerrit and removed the special cases in repoupdate. Change-Id: I02cba3f3cf3c6b53f745b6649df7b507feabeb16 --- M bin/repoupdate M groups/MediaWiki/mediawiki-extensions.txt M groups/mwgerrit/mwgerrit.yaml M repoconfig.commit.json M repoconfig.json 5 files changed, 47 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/08/281308/1 diff --git a/bin/repoupdate b/bin/repoupdate index 8be4d22..f3e9fe1 100755 --- a/bin/repoupdate +++ b/bin/repoupdate @@ -134,10 +134,6 @@ echo "$(fetchReposFromGerrit mediawiki/extensions/)" | xargs -P4 -I___ "$CLUPDATE_GERRIT" "$REPO_MWEXTGIT/___.git" "$DIR/$PROJECT/extensions/___" - 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" - elif [ "$PROJECT" = "mediawiki-skins" ] then if [ -z "$REPO_MWSKINGIT" ] diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index c6eb33d..b63f361 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -2481,24 +2481,9 @@ Vips Scaler aliasfile = VipsScaler/VipsScaler.alias.php -OOjs UI (via VisualEditor) -id = ext-visualeditor-oojs-ui -descmsg = visualeditor-desc -file = oojs-ui/i18n/%CODE%.json -optional = ooui-semicolon-separator - Vine Virtual Keyboard - -VisualEditor Core -id = ext-visualeditor-ve -descmsg = visualeditor-desc -file = VisualEditorVisualEditor/i18n/%CODE%.json -ignored = visualeditor-languageannotation-description -optional = visualeditor-specialcharinspector-characterlist-insert -optional = visualeditor-dimensionswidget-px, visualeditor-dimensionswidget-times -optional = visualeditor-languageannotation-description-with-dir VisualEditor (MediaWiki extension) id = ext-visualeditor-ve-mw diff --git a/groups/mwgerrit/mwgerrit.yaml b/groups/mwgerrit/mwgerrit.yaml index e030c48..ba20cd4 100644 --- a/groups/mwgerrit/mwgerrit.yaml +++ b/groups/mwgerrit/mwgerrit.yaml @@ -30,3 +30,34 @@ FILES: class: JsonFFS sourcePattern: "%GROUPROOT%/mwgerrit/data-values/value-view/i18n/%CODE%.json" +--- +BASIC: + id: mwgerrit-oojs-ui + label: OOjs UI (via VisualEditor) + description: "{{Special:MyLanguage/MediaWiki:Visualeditor-desc/en}}" + +FILES: + class: JsonFFS + sourcePattern: "%GROUPROOT%/mwgerrit/oojs/ui/i18n/%CODE%.json" + +TAGS: + optional: +- ooui-semicolon-separator +--- +BASIC: + id: mwgerrit-visualeditor-ve + label: VisualEditor Core + description: "{{Special:MyLanguage/MediaWiki:Visualeditor-desc/en}}" + +FILES: + class: JsonFFS + sourcePattern: "%GROUPROOT%/mwgerrit/VisualEditor/VisualEditor/i18n/%CODE%.json" + +TAGS: + optional: +- visualeditor-specialcharinspector-characterlist-insert +- visualeditor-dimensionswidget-px +- visualeditor-dimensionswidget-times +- visualeditor-languageannotation-description-with-dir + ignored: +- visualeditor-languageannotation-description diff --git a/repoconfig.commit.json b/repoconfig.commit.json index 99ae1db..e244589 100644 --- a/repoconfig.commit.json +++ b/repoconfig.commit.json @@ -181,6 +181,14 @@ "mwgerrit/data-values/value-view": { "type": "wmgerrit", "url": "ssh://l10n-...@gerrit.wikimedia.org:29418/data-values/value-view" + }, + "mwgerrit/oojs/ui": { + "type": "wmgerrit", + "url": "ssh://l10n-...@gerrit.wikimedia.org:29418/oojs/ui" + }, + "mwgerrit/VisualEditor/VisualEditor": { + "type": "wmgerrit", + "url": "ssh://l10n-...@gerrit.wikimedia.org:29418/VisualEditor/VisualEditor" } } }, diff --git a/repoconfig.json b/repoconfig.json index 7d48510..52c49d9 100644 --- a/repoconfig.json +++ b/repoconfig.json @@ -181,6 +181,14 @@ "mwgerrit/data-values/value-view": { "type": "wmgerrit", "url": "https://gerrit.wikimedia.org/r/data-values/value-view"; + }, + "mwgerrit/oojs/ui": { + "type": "wmgerrit", + "url": "https://gerrit.wikimedia.org/r/oojs/ui"; + }, + "mwgerrit/VisualEditor/Visua
[MediaWiki-commits] [Gerrit] VisualEditor and OO JS groups now use repong - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: VisualEditor and OO JS groups now use repong .. VisualEditor and OO JS groups now use repong Added to the project wmgerrit and removed the special cases in repoupdate. Bug: T131712 Change-Id: I02cba3f3cf3c6b53f745b6649df7b507feabeb16 --- M bin/repoupdate M groups/MediaWiki/mediawiki-extensions.txt M groups/mwgerrit/mwgerrit.yaml M repoconfig.commit.json M repoconfig.json 5 files changed, 47 insertions(+), 19 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/bin/repoupdate b/bin/repoupdate index 8be4d22..f3e9fe1 100755 --- a/bin/repoupdate +++ b/bin/repoupdate @@ -134,10 +134,6 @@ echo "$(fetchReposFromGerrit mediawiki/extensions/)" | xargs -P4 -I___ "$CLUPDATE_GERRIT" "$REPO_MWEXTGIT/___.git" "$DIR/$PROJECT/extensions/___" - 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" - elif [ "$PROJECT" = "mediawiki-skins" ] then if [ -z "$REPO_MWSKINGIT" ] diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index c6eb33d..b63f361 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -2481,24 +2481,9 @@ Vips Scaler aliasfile = VipsScaler/VipsScaler.alias.php -OOjs UI (via VisualEditor) -id = ext-visualeditor-oojs-ui -descmsg = visualeditor-desc -file = oojs-ui/i18n/%CODE%.json -optional = ooui-semicolon-separator - Vine Virtual Keyboard - -VisualEditor Core -id = ext-visualeditor-ve -descmsg = visualeditor-desc -file = VisualEditorVisualEditor/i18n/%CODE%.json -ignored = visualeditor-languageannotation-description -optional = visualeditor-specialcharinspector-characterlist-insert -optional = visualeditor-dimensionswidget-px, visualeditor-dimensionswidget-times -optional = visualeditor-languageannotation-description-with-dir VisualEditor (MediaWiki extension) id = ext-visualeditor-ve-mw diff --git a/groups/mwgerrit/mwgerrit.yaml b/groups/mwgerrit/mwgerrit.yaml index e030c48..ba20cd4 100644 --- a/groups/mwgerrit/mwgerrit.yaml +++ b/groups/mwgerrit/mwgerrit.yaml @@ -30,3 +30,34 @@ FILES: class: JsonFFS sourcePattern: "%GROUPROOT%/mwgerrit/data-values/value-view/i18n/%CODE%.json" +--- +BASIC: + id: mwgerrit-oojs-ui + label: OOjs UI (via VisualEditor) + description: "{{Special:MyLanguage/MediaWiki:Visualeditor-desc/en}}" + +FILES: + class: JsonFFS + sourcePattern: "%GROUPROOT%/mwgerrit/oojs/ui/i18n/%CODE%.json" + +TAGS: + optional: +- ooui-semicolon-separator +--- +BASIC: + id: mwgerrit-visualeditor-ve + label: VisualEditor Core + description: "{{Special:MyLanguage/MediaWiki:Visualeditor-desc/en}}" + +FILES: + class: JsonFFS + sourcePattern: "%GROUPROOT%/mwgerrit/VisualEditor/VisualEditor/i18n/%CODE%.json" + +TAGS: + optional: +- visualeditor-specialcharinspector-characterlist-insert +- visualeditor-dimensionswidget-px +- visualeditor-dimensionswidget-times +- visualeditor-languageannotation-description-with-dir + ignored: +- visualeditor-languageannotation-description diff --git a/repoconfig.commit.json b/repoconfig.commit.json index 99ae1db..e244589 100644 --- a/repoconfig.commit.json +++ b/repoconfig.commit.json @@ -181,6 +181,14 @@ "mwgerrit/data-values/value-view": { "type": "wmgerrit", "url": "ssh://l10n-...@gerrit.wikimedia.org:29418/data-values/value-view" + }, + "mwgerrit/oojs/ui": { + "type": "wmgerrit", + "url": "ssh://l10n-...@gerrit.wikimedia.org:29418/oojs/ui" + }, + "mwgerrit/VisualEditor/VisualEditor": { + "type": "wmgerrit", + "url": "ssh://l10n-...@gerrit.wikimedia.org:29418/VisualEditor/VisualEditor" } } }, diff --git a/repoconfig.json b/repoconfig.json index 7d48510..52c49d9 100644 --- a/repoconfig.json +++ b/repoconfig.json @@ -181,6 +181,14 @@ "mwgerrit/data-values/value-view": { "type": "wmgerrit", "url": "https://gerrit.wikimedia.org/r/data-values/value-view"; + }, + "mwgerrit/oojs/ui": { + "type": "wmgerrit", + "url": "https://gerrit.wikimedia.org/r/oojs/ui"; + }, + "mwgerrit/VisualEditor/VisualEditor": { +