Merge branch 'master' of https://github.com/Swarmops/Swarmops
This commit is contained in:
@@ -186,26 +186,8 @@
|
||||
<artifactDirectory>C:\Lab\Swarmops\artifact-sprint</artifactDirectory>
|
||||
<webURL>http://build.swarmops.com/server/auxiliary/project/Swarmops/ViewLatestBuildReport.aspx</webURL>
|
||||
|
||||
<sourcecontrol type="git">
|
||||
<repository>git://github.com/Swarmops/Swarmops</repository>
|
||||
<branch>sprint</branch>
|
||||
<cleanUntrackedFiles>true</cleanUntrackedFiles>
|
||||
<autoGetSource>true</autoGetSource>
|
||||
<fetchSubmodules>true</fetchSubmodules>
|
||||
<executable>git</executable>
|
||||
<tagOnSuccess>false</tagOnSuccess>
|
||||
<commitBuildModifications>false</commitBuildModifications>
|
||||
<commitUntrackedFiles>false</commitUntrackedFiles>
|
||||
<tagCommitMessage>Build {0}</tagCommitMessage>
|
||||
<tagNameFormat>Build-{0}</tagNameFormat>
|
||||
<committerName>Swarmops Build</committerName>
|
||||
<committerEMail>builds@swarmops.com</committerEMail>
|
||||
<workingDirectory>c:\Lab\Swarmops\sprint</workingDirectory>
|
||||
<timeout>180000</timeout>
|
||||
</sourcecontrol>
|
||||
|
||||
<triggers>
|
||||
<intervalTrigger name="continuous" seconds="60" />
|
||||
<!--<intervalTrigger name="continuous" seconds="60" /> only manual -->
|
||||
</triggers>
|
||||
|
||||
<labeller type="assemblyVersionLabeller">
|
||||
@@ -217,35 +199,10 @@
|
||||
|
||||
<tasks>
|
||||
|
||||
<!-- Build backend -->
|
||||
|
||||
<msbuild>
|
||||
<executable>C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe</executable>
|
||||
<workingDirectory>C:\Lab\Swarmops\sprint</workingDirectory>
|
||||
<projectFile>Backend\Backend.csproj</projectFile>
|
||||
<buildArgs>/p:Configuration=Release</buildArgs>
|
||||
<targets>Build</targets>
|
||||
<timeout>1200</timeout>
|
||||
<logger>C:\Program Files (x86)\CruiseControl.NET\server\Rodemeyer.MsBuildToCCnet.dll</logger>
|
||||
</msbuild>
|
||||
|
||||
<!-- Build frontend -->
|
||||
|
||||
<msbuild>
|
||||
<executable>C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe</executable>
|
||||
<workingDirectory>C:\Lab\Swarmops\sprint</workingDirectory>
|
||||
<projectFile>Interface\Interface.csproj</projectFile>
|
||||
<buildArgs>/p:Configuration=Release</buildArgs>
|
||||
<targets>Build</targets>
|
||||
<timeout>1200</timeout>
|
||||
<logger>C:\Program Files (x86)\CruiseControl.NET\server\Rodemeyer.MsBuildToCCnet.dll</logger>
|
||||
</msbuild>
|
||||
|
||||
|
||||
<!-- Deploy: only on success of all steps above -->
|
||||
<!-- Deploy: copy from last Internal build (which was the approved Sprint Build) -->
|
||||
|
||||
<buildpublisher>
|
||||
<sourceDir>C:\Lab\Swarmops\sprint\Site5-Deployment</sourceDir>
|
||||
<sourceDir>C:\Lab\Swarmops\build\Site5-Deployment</sourceDir>
|
||||
<publishDir>\\swarmops-dev\builddrop\swarmops\sprint\frontend</publishDir>
|
||||
<useLabelSubDirectory>false</useLabelSubDirectory>
|
||||
<cleanPublishDirPriorToCopy>true</cleanPublishDirPriorToCopy>
|
||||
@@ -253,7 +210,7 @@
|
||||
</buildpublisher>
|
||||
|
||||
<buildpublisher>
|
||||
<sourceDir>C:\Lab\Swarmops\sprint\Backend\bin\Release</sourceDir>
|
||||
<sourceDir>C:\Lab\Swarmops\build\Backend\bin\Release</sourceDir>
|
||||
<publishDir>\\swarmops-dev\builddrop\swarmops\sprint\backend</publishDir>
|
||||
<useLabelSubDirectory>false</useLabelSubDirectory>
|
||||
<cleanPublishDirPriorToCopy>true</cleanPublishDirPriorToCopy>
|
||||
@@ -269,7 +226,7 @@
|
||||
|
||||
<exec>
|
||||
<executable>cmd.exe</executable>
|
||||
<buildArgs>/c git rev-parse HEAD > \\swarmops-dev\builddrop\swarmops\sprint\CommitIdentity.txt</buildArgs>
|
||||
<buildArgs>/c copy \\swarmops-dev\builddrop\swarmops\internal\CommitIdentity.txt \\swarmops-dev\builddrop\swarmops\sprint\CommitIdentity.txt</buildArgs>
|
||||
</exec>
|
||||
|
||||
<!-- no "last git commit messages" written to deployment dir, as they aren't used for the sprint release -->
|
||||
|
||||
@@ -2,7 +2,7 @@ Package: swarmops-backend-stable
|
||||
Version: --BuildNumber--
|
||||
Architecture: all
|
||||
Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net)
|
||||
Depends: swarmops-common-stable,mono-runtime,libmono-corlib4.0-cil,libmono-posix4.0-cil,libmono-system-data4.0-cil
|
||||
Depends: swarmops-common-stable,mono-runtime,libmono-corlib4.0-cil,libmono-posix4.0-cil,libmono-system-data4.0-cil,libmono-system-web-http4.0-cil,libmono-system-web-services4.0-cil
|
||||
Conflicts: swarmops-backend-internal,swarmops-backend
|
||||
Homepage: http://swarmops.com/
|
||||
Description: Swarmops Backend (Stable)
|
||||
|
||||
@@ -2,7 +2,7 @@ Package: swarmops-backend
|
||||
Version: --BuildNumber--
|
||||
Architecture: all
|
||||
Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net)
|
||||
Depends: swarmops-common,mono-runtime,libmono-corlib4.0-cil,libmono-posix4.0-cil,libmono-system-data4.0-cil
|
||||
Depends: swarmops-common,mono-runtime,libmono-corlib4.0-cil,libmono-posix4.0-cil,libmono-system-data4.0-cil,libmono-system-web-http4.0-cil,libmono-system-web-services4.0-cil
|
||||
Conflicts: swarmops-backend-internal,swarmops-backend-stable
|
||||
Homepage: http://swarmops.com/
|
||||
Description: Swarmops Backend
|
||||
|
||||
Reference in New Issue
Block a user