[MediaWiki-commits] [Gerrit] Migrate Freecol and FUEL to repong - change (translatewiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Migrate Freecol and FUEL to repong
..
Migrate Freecol and FUEL to repong
Change-Id: I55ef587713ad896178edc6c7ac92c25d600c73fc
---
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, 38 insertions(+), 17 deletions(-)
Approvals:
Nikerabbit: Looks good to me, but someone else must approve
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/REPOCONF b/REPOCONF
index 95a19ca..6c728a6 100644
--- a/REPOCONF
+++ b/REPOCONF
@@ -7,9 +7,7 @@
REPO_MWSKINGIT=https://gerrit.wikimedia.org/r/p/mediawiki/skins
REPO_EOL=https://github.com/EOL/eol.git
-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
REPO_IHRIS=http://bazaar.launchpad.net/~intrahealth%2Binformatics
REPO_IHRIS_BRANCH="4.2-dev"
REPO_IHRIS_MODULES="i2ce ihris-common ihris-manage ihris-qualify ihris-train"
diff --git a/REPOCONF.commit b/REPOCONF.commit
index f8f3540..f68afd7 100644
--- a/REPOCONF.commit
+++ b/REPOCONF.commit
@@ -16,9 +16,7 @@
# other
REPO_EOL=g...@github.com:EOL/eol.git
-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
REPO_IHRIS=http://bazaar.launchpad.net/~intrahealth%2Binformatics
REPO_IHRIS_BRANCH="4.2"
REPO_IHRIS_MODULES="i2ce ihris-common ihris-manage ihris-qualify ihris-train"
diff --git a/bin/REPONG-PROJECTS b/bin/REPONG-PROJECTS
index 44915db..bdb0105 100644
--- a/bin/REPONG-PROJECTS
+++ b/bin/REPONG-PROJECTS
@@ -5,6 +5,8 @@
entryscape
etherpad-lite
europeana
+freecol
+fuel
hivejs
huggle
inaturalist
diff --git a/bin/repocommit b/bin/repocommit
index 4bb3851..4269d6b 100755
--- a/bin/repocommit
+++ b/bin/repocommit
@@ -38,8 +38,6 @@
# TODO: Move to separate file?
GITPROJECTS="\
eol \
-freecol \
-fuel \
intuition \
int-orphantalk \
int-raun \
diff --git a/bin/repoexport b/bin/repoexport
index 863d41b..6b4d29f 100755
--- a/bin/repoexport
+++ b/bin/repoexport
@@ -33,18 +33,9 @@
then
php "$EXPORTER" --target . --group=out-eol* --lang='*' --skip en
$THRESHOLD
-elif [ "$PROJECT" = "freecol" ]
-then
- php "$EXPORTER" --target . --group=out-freecol --lang='*' --skip en,qqq
$THRESHOLD
- php "$EXPORTER" --target . --group=out-freecol --lang qqq
-
elif [ "$PROJECT" = "fudforum" ]
then
php "$EXPORTER" --target . --group=out-fudforum --lang='*' --skip en
$THRESHOLD
-
-elif [ "$PROJECT" = "fuel" ]
-then
- php "$EXPORTER" --target . --group=out-fuel* --lang='*' --skip en,qqq
$THRESHOLD
elif [ "$PROJECT" = "ihris" ]
then
diff --git a/bin/repoupdate b/bin/repoupdate
index f75c28a..cdf46a9 100755
--- a/bin/repoupdate
+++ b/bin/repoupdate
@@ -47,8 +47,6 @@
GITCLUPDATE="\
eol \
-freecol \
-fuel \
intuition \
int-orphantalk \
int-raun \
diff --git a/repoconfig.commit.json b/repoconfig.commit.json
index d41af5c..7be341c 100644
--- a/repoconfig.commit.json
+++ b/repoconfig.commit.json
@@ -71,6 +71,24 @@
}
}
},
+ "freecol": {
+ "group": "out-freecol",
+ "repos": {
+ "fuel": {
+ "type": "gitwithusername",
+ "url":
"ssh://usern...@git.code.sf.net/p/freecol/git"
+ }
+ }
+ },
+ "fuel": {
+ "group": "out-fuel-*",
+ "repos": {
+ "fuel": {
+ "type": "gitwithusername",
+ "url":
"ssh://usern...@git.fedorahosted.org/git/fuel.git"
+ }
+ }
+ },
"hivejs": {
"group": "hivejs-*",
"repos": {
diff --git a/repoconfig.json b/repoconfig.json
index 21ae40b..337a241 100644
--- a/repoconfig.json
+++ b/repoconfig.json
@@ -71,6 +71,24 @@
}
}
},
+ "freecol": {
+ "group": "out-freecol",
+ "repos": {
+ "fuel": {
+ "type": "git",
+ "url": "git://git.code.sf.net/p/freecol/git"
+ }
+ }
+ },
+ "fuel": {
+ "group": "out-fuel-*",
+ "repos": {
+ "fuel": {
+ "type": "git",
+ "url": "git://git.fedorahosted.org/fuel.git"
+ }
+ }
+ },
"hivejs": {
[MediaWiki-commits] [Gerrit] Migrate Freecol and FUEL to repong - change (translatewiki)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/290194
Change subject: Migrate Freecol and FUEL to repong
..
Migrate Freecol and FUEL to repong
Change-Id: I55ef587713ad896178edc6c7ac92c25d600c73fc
---
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, 38 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/94/290194/1
diff --git a/REPOCONF b/REPOCONF
index 95a19ca..6c728a6 100644
--- a/REPOCONF
+++ b/REPOCONF
@@ -7,9 +7,7 @@
REPO_MWSKINGIT=https://gerrit.wikimedia.org/r/p/mediawiki/skins
REPO_EOL=https://github.com/EOL/eol.git
-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
REPO_IHRIS=http://bazaar.launchpad.net/~intrahealth%2Binformatics
REPO_IHRIS_BRANCH="4.2-dev"
REPO_IHRIS_MODULES="i2ce ihris-common ihris-manage ihris-qualify ihris-train"
diff --git a/REPOCONF.commit b/REPOCONF.commit
index f8f3540..f68afd7 100644
--- a/REPOCONF.commit
+++ b/REPOCONF.commit
@@ -16,9 +16,7 @@
# other
REPO_EOL=g...@github.com:EOL/eol.git
-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
REPO_IHRIS=http://bazaar.launchpad.net/~intrahealth%2Binformatics
REPO_IHRIS_BRANCH="4.2"
REPO_IHRIS_MODULES="i2ce ihris-common ihris-manage ihris-qualify ihris-train"
diff --git a/bin/REPONG-PROJECTS b/bin/REPONG-PROJECTS
index 44915db..bdb0105 100644
--- a/bin/REPONG-PROJECTS
+++ b/bin/REPONG-PROJECTS
@@ -5,6 +5,8 @@
entryscape
etherpad-lite
europeana
+freecol
+fuel
hivejs
huggle
inaturalist
diff --git a/bin/repocommit b/bin/repocommit
index 4bb3851..4269d6b 100755
--- a/bin/repocommit
+++ b/bin/repocommit
@@ -38,8 +38,6 @@
# TODO: Move to separate file?
GITPROJECTS="\
eol \
-freecol \
-fuel \
intuition \
int-orphantalk \
int-raun \
diff --git a/bin/repoexport b/bin/repoexport
index 863d41b..6b4d29f 100755
--- a/bin/repoexport
+++ b/bin/repoexport
@@ -33,18 +33,9 @@
then
php "$EXPORTER" --target . --group=out-eol* --lang='*' --skip en
$THRESHOLD
-elif [ "$PROJECT" = "freecol" ]
-then
- php "$EXPORTER" --target . --group=out-freecol --lang='*' --skip en,qqq
$THRESHOLD
- php "$EXPORTER" --target . --group=out-freecol --lang qqq
-
elif [ "$PROJECT" = "fudforum" ]
then
php "$EXPORTER" --target . --group=out-fudforum --lang='*' --skip en
$THRESHOLD
-
-elif [ "$PROJECT" = "fuel" ]
-then
- php "$EXPORTER" --target . --group=out-fuel* --lang='*' --skip en,qqq
$THRESHOLD
elif [ "$PROJECT" = "ihris" ]
then
diff --git a/bin/repoupdate b/bin/repoupdate
index f75c28a..cdf46a9 100755
--- a/bin/repoupdate
+++ b/bin/repoupdate
@@ -47,8 +47,6 @@
GITCLUPDATE="\
eol \
-freecol \
-fuel \
intuition \
int-orphantalk \
int-raun \
diff --git a/repoconfig.commit.json b/repoconfig.commit.json
index 9244286..6e17cae 100644
--- a/repoconfig.commit.json
+++ b/repoconfig.commit.json
@@ -71,6 +71,24 @@
}
}
},
+ "freecol": {
+ "group": "out-freecol",
+ "repos": {
+ "fuel": {
+ "type": "gitwithusername",
+ "url":
"ssh://usern...@git.code.sf.net/p/freecol/git"
+ }
+ }
+ },
+ "fuel": {
+ "group": "out-fuel-*",
+ "repos": {
+ "fuel": {
+ "type": "gitwithusername",
+ "url":
"ssh://usern...@git.fedorahosted.org/git/fuel.git"
+ }
+ }
+ },
"hivejs": {
"group": "hivejs*",
"repos": {
diff --git a/repoconfig.json b/repoconfig.json
index 0e8f8d7..bca88d1 100644
--- a/repoconfig.json
+++ b/repoconfig.json
@@ -71,6 +71,24 @@
}
}
},
+ "freecol": {
+ "group": "out-freecol",
+ "repos": {
+ "fuel": {
+ "type": "git",
+ "url": "git://git.code.sf.net/p/freecol/git"
+ }
+ }
+ },
+ "fuel": {
+ "group": "out-fuel-*",
+ "repos": {
+ "fuel": {
+ "type": "git",
+ "url": "git://git.fedorahosted.org/fuel.git"
+ }
+ }
+ },
"hivejs": {
"group":
