r70897 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r70896‎ | r70897 | r70898 >
Date:16:09, 11 August 2010
Author:mah
Status:deferred
Tags:
Comment:
fix url misspelling, update instructions.
Modified paths:
  • /trunk/test-server/README (modified) (history)
  • /trunk/test-server/cc-home/config.xml (modified) (history)

Diff [purge]

Index: trunk/test-server/cc-home/config.xml
@@ -1,13 +1,15 @@
22 <?xml version="1.0"?>
33 <cruisecontrol>
44 <project name="mw">
5 - <plugin name="svnbootstrapper" classname="net.sourceforge.cruisecontrol.bootstrappers.SVNBootstrapper"/>
 5+ <plugin name="svnbootstrapper"
 6+ classname="net.sourceforge.cruisecontrol.bootstrappers.SVNBootstrapper"/>
67 <plugin name="svn" classname="net.sourceforge.cruisecontrol.sourcecontrols.SVN"/>
78 <listeners>
89 <currentbuildstatuslistener file="logs/${project.name}/status.txt"/>
910 </listeners>
1011 <bootstrappers>
11 - <antbootstrapper anthome="apache-ant-1.7.0" buildfile="projects/${project.name}/build.xml" target="clean"/>
 12+ <antbootstrapper anthome="apache-ant-1.7.0"
 13+ buildfile="projects/${project.name}/build.xml" target="clean"/>
1214 </bootstrappers>
1315 <modificationset quietperiod="60">
1416 <!-- touch any file in connectfour project to trigger a build -->
@@ -21,9 +23,15 @@
2224 <merge dir="projects/${project.name}/build/logs"/>
2325 </log>
2426 <publishers>
25 - <artifactspublisher dir="projects/${project.name}/build/api" dest="artifacts/${project.name}" subdirectory="api"/>
26 - <artifactspublisher dir="projects/${project.name}/build/coverage" dest="artifacts/${project.name}" subdirectory="coverage"/>
27 - <execute command="phpcb --log projects/${project.name}/build/logs --source projects/${project.name}/source --output projects/${project.name}/build/${project.name}"/>
 27+ <antpublisher anthome="apache-ant-1.7.0"
 28+ buildfile="projects/${project.name}/irc-publisher.xml"/>
 29+ <artifactspublisher dir="projects/${project.name}/build/api"
 30+ dest="artifacts/${project.name}" subdirectory="api"/>
 31+ <artifactspublisher dir="projects/${project.name}/build/coverage"
 32+ dest="artifacts/${project.name}" subdirectory="coverage"/>
 33+ <execute command="phpcb --log projects/${project.name}/build/logs
 34+ --source projects/${project.name}/source
 35+ --output projects/${project.name}/build/${project.name}"/>
2836 <!-- <artifactspublisher dir="projects/${project.name}/build/php-code-browser" dest="artifacts/${project.name}" subdirectory="php-code-browser"/> -->
2937 <execute command="/usr/bin/phpuc graph logs/${project.name} artifacts/${project.name}"/>
3038 <!--
@@ -35,7 +43,7 @@
3644 -->
3745 <email mailhost="localhost"
3846 returnaddress="cruise@phpundercontrol.org"
39 - buildresultsurl="http://ci.tessla.usability.wikimedia.org:8080/cruisecontrol/buildresults/${project.name}"
 47+ buildresultsurl="http://ci.tesla.usability.wikimedia.org:8080/cruisecontrol/buildresults/${project.name}"
4048 skipusers="true" spamwhilebroken="true">
4149 <failure address="mah@everybody.org"/>
4250 </email>
Index: trunk/test-server/README
@@ -6,8 +6,8 @@
77 http://phpundercontrol.org/documentation/installation.html
88
99 After that, the projects/connectfour sample directory is erased and
10 -the config.xml, cruisecontrol.sh, and projects/mw directories from
11 -this configuration are put into place.
 10+the contents of the cc-home directory (e.g. config.xml,
 11+cruisecontrol.sh, etc) should be copied to your cruisecontrol installation.
1212
1313 Finally, add the cruisecontrol user:
1414
@@ -17,6 +17,9 @@
1818
1919 cp cruisecontrol-init.d /etc/init.d/cruisecontrol
2020
 21+Make sure CCDIR in the init.d script points to your cruisecontrol
 22+installation.
 23+
2124 make it executable
2225
2326 chmod +x /etc/init.d/cruisecontrol

Status & tagging log