[MediaWiki-commits] [Gerrit] Migrate etherpad to repong - change (translatewiki)

2016-05-23 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Migrate etherpad to repong
..


Migrate etherpad to repong

Change-Id: Ib6da1ee2a9ba923c29e51ee98b251983e606c4c1
---
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, 23 insertions(+), 18 deletions(-)

Approvals:
  Siebrand: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/REPOCONF b/REPOCONF
index bc25035..25b1d2e 100644
--- a/REPOCONF
+++ b/REPOCONF
@@ -7,8 +7,6 @@
 REPO_MWSKINGIT=https://gerrit.wikimedia.org/r/p/mediawiki/skins
 
 REPO_EOL=git://github.com/EOL/eol.git
-REPO_ETHERPADLITE=git://github.com/ether/etherpad-lite.git
-REPO_ETHERPADLITE_BRANCH="develop"
 REPO_FREECOL=git://git.code.sf.net/p/freecol/git
 
REPO_FUDFORUM=svn://svn.code.sf.net/p/fudforum/code/trunk/install/forum_data/thm/default/i18n
 REPO_FUEL=git://git.fedorahosted.org/fuel.git
diff --git a/REPOCONF.commit b/REPOCONF.commit
index a3a76f8..ad51fcf 100644
--- a/REPOCONF.commit
+++ b/REPOCONF.commit
@@ -16,8 +16,6 @@
 
 # other
 REPO_EOL=g...@github.com:EOL/eol.git
-REPO_ETHERPADLITE=g...@github.com:ether/etherpad-lite.git
-REPO_ETHERPADLITE_BRANCH="develop"
 REPO_FREECOL=ssh://${THISUSER}@git.code.sf.net/p/freecol/git
 
REPO_FUDFORUM=svn+ssh://${THISUSER}@svn.code.sf.net/p/fudforum/code/trunk/install/forum_data/thm/default/i18n
 REPO_FUEL=ssh://${THISUSER}@git.fedorahosted.org/git/fuel.git
diff --git a/bin/REPONG-PROJECTS b/bin/REPONG-PROJECTS
index 0596676..91ff82c 100644
--- a/bin/REPONG-PROJECTS
+++ b/bin/REPONG-PROJECTS
@@ -3,6 +3,7 @@
 codev
 crosswatch
 entryscape
+etherpad-lite
 europeana
 hivejs
 inaturalist
diff --git a/bin/repocommit b/bin/repocommit
index 3c70419..3a8cac7 100755
--- a/bin/repocommit
+++ b/bin/repocommit
@@ -94,11 +94,7 @@
fi
 done
 
-if [ "$PROJECT" = "etherpad-lite" ]
-then
-gitCommit "$DIR/$PROJECT" develop
-
-elif [ "$PROJECT" = "fudforum" ]
+if [ "$PROJECT" = "fudforum" ]
 then
cd "$DIR/$PROJECT"
svn add -q --force *
diff --git a/bin/repoexport b/bin/repoexport
index 3439ee9..a247205 100755
--- a/bin/repoexport
+++ b/bin/repoexport
@@ -33,10 +33,6 @@
 then
php "$EXPORTER" --target . --group=out-eol* --lang='*' --skip en 
$THRESHOLD
 
-elif [ "$PROJECT" = "etherpad-lite" ]
-then
-   php "$EXPORTER" --target . --group=out-$PROJECT --lang='*' --skip 
en,qqq $THRESHOLD
-
 elif [ "$PROJECT" = "freecol" ]
 then
php "$EXPORTER" --target . --group=out-freecol --lang='*' --skip en,qqq 
$THRESHOLD
diff --git a/bin/repoupdate b/bin/repoupdate
index 2f05d95..a3cebed 100755
--- a/bin/repoupdate
+++ b/bin/repoupdate
@@ -92,11 +92,7 @@
fi
 done
 
-if [ "$PROJECT" = "etherpad-lite" ]
-then
-   doUpdate "$PROJECT" "$CLUPDATE" $REPO_ETHERPADLITE_BRANCH
-
-elif [ "$PROJECT" = "fudforum" ]
+if [ "$PROJECT" = "fudforum" ]
 then
svn up -q $PROJECT
 
diff --git a/repoconfig.commit.json b/repoconfig.commit.json
index b04197b..5581ba2 100644
--- a/repoconfig.commit.json
+++ b/repoconfig.commit.json
@@ -51,6 +51,16 @@
}
}
},
+   "etherpad-lite": {
+   "group": "out-etherpad-lite",
+   "repos": {
+   "etherpad-lite": {
+   "type": "git",
+   "branch": "develop",
+   "url": "g...@github.com:ether/etherpad-lite.git"
+   }
+   }
+   },
"europeana": {
"group": "out-europeana",
"export-threshold": 75,
diff --git a/repoconfig.json b/repoconfig.json
index 7e89725..768297e 100644
--- a/repoconfig.json
+++ b/repoconfig.json
@@ -51,6 +51,16 @@
}
}
},
+   "etherpad-lite": {
+   "group": "out-etherpad-lite",
+   "repos": {
+   "etherpad-lite": {
+   "type": "git",
+   "branch": "develop",
+   "url": 
"git://github.com/ether/etherpad-lite.git"
+   }
+   }
+   },
"europeana": {
"group": "out-europeana",
"export-threshold": 75,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6da1ee2a9ba923c29e51ee98b251983e606c4c1
Gerrit-PatchSet: 3
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] Migrate etherpad to repong - change (translatewiki)

2016-05-23 Thread Siebrand (Code Review) 
Siebrand has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/290185

Change subject: Migrate etherpad to repong
..

Migrate etherpad to repong

Change-Id: Ib6da1ee2a9ba923c29e51ee98b251983e606c4c1
---
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, 21 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/85/290185/1

diff --git a/REPOCONF b/REPOCONF
index bc25035..25b1d2e 100644
--- a/REPOCONF
+++ b/REPOCONF
@@ -7,8 +7,6 @@
 REPO_MWSKINGIT=https://gerrit.wikimedia.org/r/p/mediawiki/skins
 
 REPO_EOL=git://github.com/EOL/eol.git
-REPO_ETHERPADLITE=git://github.com/ether/etherpad-lite.git
-REPO_ETHERPADLITE_BRANCH="develop"
 REPO_FREECOL=git://git.code.sf.net/p/freecol/git
 
REPO_FUDFORUM=svn://svn.code.sf.net/p/fudforum/code/trunk/install/forum_data/thm/default/i18n
 REPO_FUEL=git://git.fedorahosted.org/fuel.git
diff --git a/REPOCONF.commit b/REPOCONF.commit
index a3a76f8..ad51fcf 100644
--- a/REPOCONF.commit
+++ b/REPOCONF.commit
@@ -16,8 +16,6 @@
 
 # other
 REPO_EOL=g...@github.com:EOL/eol.git
-REPO_ETHERPADLITE=g...@github.com:ether/etherpad-lite.git
-REPO_ETHERPADLITE_BRANCH="develop"
 REPO_FREECOL=ssh://${THISUSER}@git.code.sf.net/p/freecol/git
 
REPO_FUDFORUM=svn+ssh://${THISUSER}@svn.code.sf.net/p/fudforum/code/trunk/install/forum_data/thm/default/i18n
 REPO_FUEL=ssh://${THISUSER}@git.fedorahosted.org/git/fuel.git
diff --git a/bin/REPONG-PROJECTS b/bin/REPONG-PROJECTS
index 0596676..91ff82c 100644
--- a/bin/REPONG-PROJECTS
+++ b/bin/REPONG-PROJECTS
@@ -3,6 +3,7 @@
 codev
 crosswatch
 entryscape
+etherpad-lite
 europeana
 hivejs
 inaturalist
diff --git a/bin/repocommit b/bin/repocommit
index 3c70419..65cd054 100755
--- a/bin/repocommit
+++ b/bin/repocommit
@@ -94,10 +94,6 @@
fi
 done
 
-if [ "$PROJECT" = "etherpad-lite" ]
-then
-gitCommit "$DIR/$PROJECT" develop
-
 elif [ "$PROJECT" = "fudforum" ]
 then
cd "$DIR/$PROJECT"
diff --git a/bin/repoexport b/bin/repoexport
index 3439ee9..a247205 100755
--- a/bin/repoexport
+++ b/bin/repoexport
@@ -33,10 +33,6 @@
 then
php "$EXPORTER" --target . --group=out-eol* --lang='*' --skip en 
$THRESHOLD
 
-elif [ "$PROJECT" = "etherpad-lite" ]
-then
-   php "$EXPORTER" --target . --group=out-$PROJECT --lang='*' --skip 
en,qqq $THRESHOLD
-
 elif [ "$PROJECT" = "freecol" ]
 then
php "$EXPORTER" --target . --group=out-freecol --lang='*' --skip en,qqq 
$THRESHOLD
diff --git a/bin/repoupdate b/bin/repoupdate
index 2f05d95..c7e0b9b 100755
--- a/bin/repoupdate
+++ b/bin/repoupdate
@@ -92,10 +92,6 @@
fi
 done
 
-if [ "$PROJECT" = "etherpad-lite" ]
-then
-   doUpdate "$PROJECT" "$CLUPDATE" $REPO_ETHERPADLITE_BRANCH
-
 elif [ "$PROJECT" = "fudforum" ]
 then
svn up -q $PROJECT
diff --git a/repoconfig.commit.json b/repoconfig.commit.json
index 55eb130..980857f 100644
--- a/repoconfig.commit.json
+++ b/repoconfig.commit.json
@@ -51,6 +51,16 @@
}
}
},
+   "etherpad-lite": {
+   "group": "out-etherpad-lite",
+   "repos": {
+   "etherpad-lite": {
+   "type": "git",
+   "branch": "develop",
+   "url": "g...@github.com:ether/etherpad-lite.git"
+   }
+   }
+   },
"europeana": {
"group": "out-europeana",
"threshold": 75,
diff --git a/repoconfig.json b/repoconfig.json
index 8394fda..0a213c4 100644
--- a/repoconfig.json
+++ b/repoconfig.json
@@ -51,6 +51,16 @@
}
}
},
+   "etherpad-lite": {
+   "group": "out-etherpad-lite",
+   "repos": {
+   "etherpad-lite": {
+   "type": "git",
+   "branch": "develop",
+   "url": 
"git://github.com/ether/etherpad-lite.git"
+   }
+   }
+   },
"europeana": {
"group": "out-europeana",
"threshold": 75,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6da1ee2a9ba923c29e51ee98b251983e606c4c1
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits