Siebrand has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/334346 )
Change subject: Migrate osm to repong ...................................................................... Migrate osm to repong Change-Id: I2597ddc5a4d5349dca1be6962332a1321e26c63e --- 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, 30 insertions(+), 31 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/46/334346/1 diff --git a/REPOCONF b/REPOCONF index 5a0849e..40953b7 100644 --- a/REPOCONF +++ b/REPOCONF @@ -9,5 +9,3 @@ REPO_IHRIS_BRANCH="4.2-dev" REPO_IHRIS_MODULES="i2ce ihris-common ihris-manage ihris-qualify ihris-train" 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 diff --git a/REPOCONF.commit b/REPOCONF.commit index 9511795..8ebca3b 100644 --- a/REPOCONF.commit +++ b/REPOCONF.commit @@ -18,5 +18,4 @@ REPO_IHRIS_BRANCH="4.2" REPO_IHRIS_MODULES="i2ce ihris-common ihris-manage ihris-qualify ihris-train" 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 + diff --git a/bin/REPONG-PROJECTS b/bin/REPONG-PROJECTS index a67df2b..06a7adc 100644 --- a/bin/REPONG-PROJECTS +++ b/bin/REPONG-PROJECTS @@ -31,6 +31,7 @@ mwgithub nfcring-control oppia +osm pageviews pywikibot vicuna diff --git a/bin/repocommit b/bin/repocommit index 70b0ed5..7e3a73c 100755 --- a/bin/repocommit +++ b/bin/repocommit @@ -27,24 +27,6 @@ git commit -q -m "$COMMITMSG" && git review -r origin -t l10n || : } -# TODO: Move to separate file? -GITPROJECTS="\ -osm" - -for i in $GITPROJECTS; do - if [ "$i" = "$PROJECT" ] - then - gitCommit "$DIR/$PROJECT" - - if [ "$PROJECT" = "osm" ] - then - gitCommit "$DIR/potlatch2" - fi - - 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 8595cc2..33075c6 100755 --- a/bin/repoexport +++ b/bin/repoexport @@ -62,10 +62,6 @@ php "$EXPORTER" --target . --group=out-nocc-* --lang='*' --skip en,qqq $THRESHOLD php "$EXPORTER" --target . --group=out-nocc-* --lang qqq -elif [ "$PROJECT" = "osm" ] -then - php "$EXPORTER" --target . --group=out-osm-* --lang='*' --skip en,qqq $THRESHOLD - else echo "`basename $0`: Unknown project" exit 1 diff --git a/bin/repoupdate b/bin/repoupdate index 7a92397..40fa196 100755 --- a/bin/repoupdate +++ b/bin/repoupdate @@ -79,11 +79,6 @@ then svn up -q "$PROJECT" -elif [ "$PROJECT" = "osm" ] -then - doUpdate "$PROJECT" "$CLUPDATE" - doUpdate "potlatch2" "$CLUPDATE" - else echo "$(basename "$0"): Unknown project" exit 1 diff --git a/repoconfig.commit.json b/repoconfig.commit.json index 92ac5c9..23d97bc 100644 --- a/repoconfig.commit.json +++ b/repoconfig.commit.json @@ -322,6 +322,20 @@ } } }, + "osm": { + "no-export-languages": "en,qqq", + "group": "out-osm-*", + "repos": { + "osm": { + "type": "git", + "url": "ssh://translatew...@git.openstreetmap.org/var/lib/git/rails.git" + }, + "potlatch2": { + "type": "github", + "url": "g...@github.com:systemed/potlatch2.git" + } + } + }, "pageviews": { "group": "pageviews", "repos": { diff --git a/repoconfig.json b/repoconfig.json index a95c879..086f129 100644 --- a/repoconfig.json +++ b/repoconfig.json @@ -317,6 +317,20 @@ } } }, + "osm": { + "no-export-languages": "en,qqq", + "group": "out-osm-*", + "repos": { + "osm": { + "type": "git", + "url": "git://git.openstreetmap.org/rails.git" + }, + "potlatch2": { + "type": "github", + "url": "https://github.com/systemed/potlatch2.git"; + } + } + }, "pageviews": { "group": "pageviews", "repos": { -- To view, visit https://gerrit.wikimedia.org/r/334346 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2597ddc5a4d5349dca1be6962332a1321e26c63e 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
