Skip to content
Snippets Groups Projects
Commit 47dfb85e authored by felmer's avatar felmer
Browse files

LMS-2427 split dist into two targets and run only screening in ci

SVN: 22524
parent de98dcc7
No related branches found
No related tags found
No related merge requests found
...@@ -37,11 +37,12 @@ ...@@ -37,11 +37,12 @@
--> -->
</target> </target>
<target name="dist" depends="compile"> <target name="dist" depends="dist-generic, dist-screening">
</target>
<target name="dist-generic" depends="compile">
<build-info revision="revision.number" version="version.number" clean="clean.flag" /> <build-info revision="revision.number" version="version.number" clean="clean.flag" />
<!-- Do not build the standard openbis installer, since building both installers doesn't work
on the ci machine (only one or the other can be built).
<antcall target="create-installation-tarball"> <antcall target="create-installation-tarball">
<param name="openbis.server.zip.folder" value="../openbis/targets/dist" /> <param name="openbis.server.zip.folder" value="../openbis/targets/dist" />
<param name="datastore.server.zip.folder" value="../datastore_server/targets/dist" /> <param name="datastore.server.zip.folder" value="../datastore_server/targets/dist" />
...@@ -49,9 +50,11 @@ ...@@ -49,9 +50,11 @@
<param name="database.kind" value="productive" /> <param name="database.kind" value="productive" />
<param name="installation.customize.folder" value="../openbis/dist/installer" /> <param name="installation.customize.folder" value="../openbis/dist/installer" />
</antcall> </antcall>
--> </target>
<target name="dist-screening" depends="compile">
<build-info revision="revision.number" version="version.number" clean="clean.flag" />
<!-- create screening installer -->
<antcall target="create-installation-tarball"> <antcall target="create-installation-tarball">
<param name="openbis.server.zip.folder" value="../screening/targets/dist" /> <param name="openbis.server.zip.folder" value="../screening/targets/dist" />
<param name="datastore.server.zip.folder" value="../screening/targets/dist" /> <param name="datastore.server.zip.folder" value="../screening/targets/dist" />
...@@ -164,7 +167,7 @@ ...@@ -164,7 +167,7 @@
<!-- <!--
// Task for continuous integration server. // Task for continuous integration server.
--> -->
<target name="ci" depends="dist" /> <target name="ci" depends="dist-screening" />
</project> </project>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment