Siebrand has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334341 )

Change subject: Migrate waymarked-trails-site to repong
......................................................................

Migrate waymarked-trails-site to repong

Change-Id: I588aa5e909abf63281c4a722129b6e51379d67d9
---
M REPOCONF
M REPOCONF.commit
M bin/REPONG-PROJECTS
M bin/repocommit
M bin/repoexport
M bin/repoupdate
M groups/OpenStreetMap/WaymarkedTrails.yaml
M repoconfig.commit.json
M repoconfig.json
9 files changed, 20 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/41/334341/1

diff --git a/REPOCONF b/REPOCONF
index ab8e37d..5a0849e 100644
--- a/REPOCONF
+++ b/REPOCONF
@@ -11,4 +11,3 @@
 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_WAYMARKEDTRAILSSITE=https://github.com/lonvia/waymarked-trails-site.git
diff --git a/REPOCONF.commit b/REPOCONF.commit
index 2a566ef..9511795 100644
--- a/REPOCONF.commit
+++ b/REPOCONF.commit
@@ -20,4 +20,3 @@
 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_WAYMARKEDTRAILSSITE=g...@github.com:lonvia/waymarked-trails-site.git
diff --git a/bin/REPONG-PROJECTS b/bin/REPONG-PROJECTS
index de35737..a67df2b 100644
--- a/bin/REPONG-PROJECTS
+++ b/bin/REPONG-PROJECTS
@@ -35,6 +35,7 @@
 pywikibot
 vicuna
 video2commons
+waymarked-trails-site
 wiki-ai
 wikiblame
 wikidata
diff --git a/bin/repocommit b/bin/repocommit
index 74bd89d..70b0ed5 100755
--- a/bin/repocommit
+++ b/bin/repocommit
@@ -29,8 +29,7 @@
 
 # TODO: Move to separate file?
 GITPROJECTS="\
-osm \
-waymarked-trails-site"
+osm"
 
 for i in $GITPROJECTS; do
        if [ "$i" = "$PROJECT" ]
diff --git a/bin/repoexport b/bin/repoexport
index 171acec..8595cc2 100755
--- a/bin/repoexport
+++ b/bin/repoexport
@@ -66,13 +66,6 @@
 then
        php "$EXPORTER" --target . --group=out-osm-* --lang='*' --skip en,qqq 
$THRESHOLD
 
-elif [ "$PROJECT" = "waymarked-trails-site" ]
-then
-       php "$EXPORTER" --target . --group=out-waymarked-trails --lang='*' 
--skip en,qqq,no --threshold 75 $HOURS
-       php "$EXPORTER" --target . --group=out-waymarked-trails --lang qqq 
$HOURS
-       php "$EXPORTER" --target . --group=out-waymarked-trails-help --lang='*' 
--skip en,qqq,no $THRESHOLD $HOURS
-       php "$EXPORTER" --target . --group=out-waymarked-trails-help --lang qqq 
$HOURS
-
 else
        echo "`basename $0`: Unknown project"
        exit 1
diff --git a/bin/repoupdate b/bin/repoupdate
index 5b7def6..7a92397 100755
--- a/bin/repoupdate
+++ b/bin/repoupdate
@@ -44,17 +44,6 @@
 else CLUPDATE_GERRIT="$DIRSCRIPT/clupdate-git-repo";
 fi
 
-GITCLUPDATE="\
-waymarked-trails-site"
-
-for i in $GITCLUPDATE; do
-       if [ "$i" = "$PROJECT" ]
-       then
-               doUpdate "$PROJECT" "$CLUPDATE"
-               exit 0
-       fi
-done
-
 REPONG=$(cat "$DIRSCRIPT/REPONG-PROJECTS");
 for i in $REPONG; do
        if [ "$i" = "$PROJECT" ]
diff --git a/groups/OpenStreetMap/WaymarkedTrails.yaml 
b/groups/OpenStreetMap/WaymarkedTrails.yaml
index 2278cb0..0157699 100644
--- a/groups/OpenStreetMap/WaymarkedTrails.yaml
+++ b/groups/OpenStreetMap/WaymarkedTrails.yaml
@@ -67,4 +67,3 @@
   class: YamlFFS
   sourcePattern: 
"%GROUPROOT%/waymarked-trails-site/django/locale/%CODE%/helppages.yaml"
   definitionFile: 
"%GROUPROOT%/waymarked-trails-site/django/locale/qot/helppages.yaml"
-
diff --git a/repoconfig.commit.json b/repoconfig.commit.json
index 0e20d1f..92ac5c9 100644
--- a/repoconfig.commit.json
+++ b/repoconfig.commit.json
@@ -499,6 +499,15 @@
                        }
                }
        },
+       "waymarked-trails-site": {
+               "group": "out-waymarked-trails*",
+               "repos": {
+                       "waymarked-trails-site": {
+                               "type": "github",
+                               "url": 
"g...@github.com:lonvia/waymarked-trails-site.git"
+                       }
+               }
+       },
        "wiki-ai": {
                "group": "wiki-ai-*",
                "repos": {
diff --git a/repoconfig.json b/repoconfig.json
index 03d9e62..a95c879 100644
--- a/repoconfig.json
+++ b/repoconfig.json
@@ -494,6 +494,15 @@
                        }
                }
        },
+       "waymarked-trails-site": {
+               "group": "out-waymarked-trails*",
+               "repos": {
+                       "waymarked-trails-site": {
+                               "type": "github",
+                               "url": 
"https://github.com/lonvia/waymarked-trails-site.git";
+                       }
+               }
+       },
        "wiki-ai": {
                "group": "wiki-ai-*",
                "repos": {

-- 
To view, visit https://gerrit.wikimedia.org/r/334341
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I588aa5e909abf63281c4a722129b6e51379d67d9
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

Reply via email to