[ARVADOS-WORKBENCH2] updated: d42466273a43e23c6731af81ead835377c7da10e

[Git user]

Summary of changes:
 run-tests-build.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

       via  d42466273a43e23c6731af81ead835377c7da10e (commit)
      from  cc3d05231211242c9c975ab01f856a3661b46f9d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit d42466273a43e23c6731af81ead835377c7da10e
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Wed May 30 15:53:19 2018 -0300

    13544: fix fpm command
    Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>

diff --git a/run-tests-build.sh b/run-tests-build.sh
index 57a70f6..a98f346 100755
--- a/run-tests-build.sh
+++ b/run-tests-build.sh
@@ -49,11 +49,12 @@ rm -Rf $WORKDIR/node_modules
 rm -f $WORKDIR/*.deb; rm -f $WORKDIR/*.rpm
 # run test and build dist 
 make test
-make build
+#make build
+yarn build
 
 # Build deb and rpm packages using fpm from dist passing the destination folder for the deploy to be /var/www/arvados-workbench2/
-fpm -s dir -t deb  -n arvados-workbench2 -v "$build_version" "--maintainer=Ward Vandewege <ward at curoverse.com>" --description "workbench2 Package" --config-files /etc/arvados/workbench2/workbench2.yml --deb-no-default-config-files $WORKDIR/dist/=/var/www/arvados-workbench2/ $WORKDIR/workbench2.yml=/etc/arvados/workbench2/workbench2.yml
-fpm -s dir -t rpm  -n arvados-workbench2 -v "$build_version" "--maintainer=Ward Vandewege <ward at curoverse.com>" --description "workbench2 Package" --config-files /etc/arvados/workbench2/workbench2.yml $WORKDIR/dist/=/var/www/arvados-workbench2/workbench2/ $WORKDIR/workbench2.yml=/etc/arvados/workbench2/workbench2.yml
+fpm -s dir -t deb  -n arvados-workbench2 -v "$build_version" "--maintainer=Ward Vandewege <ward at curoverse.com>" --description "workbench2 Package" --deb-no-default-config-files $WORKDIR/build/=/var/www/arvados-workbench2/
+fpm -s dir -t rpm  -n arvados-workbench2 -v "$build_version" "--maintainer=Ward Vandewege <ward at curoverse.com>" --description "workbench2 Package" $WORKDIR/build/=/var/www/arvados-workbench2/workbench2/
 
 mkdir $WORKDIR/packages
 mkdir $WORKDIR/packages/centos7

-----------------------------------------------------------------------


hooks/post-receive
--