13544: add build to package creation target as dependency
authorFernando Monserrat <fernando.monserrat@gmail.com>
Mon, 11 Jun 2018 20:54:07 +0000 (17:54 -0300)
committerFernando Monserrat <fernando.monserrat@gmail.com>
Mon, 11 Jun 2018 20:54:07 +0000 (17:54 -0300)
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat@veritasgenetics.com>

Makefile

index 68d10574becb4e32d71f067f881afc734f1e59ed..0e1cc82353ab437cff77097690be7fa1f0d2a5da 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,12 +31,12 @@ build:
        @yarn install
        @yarn build
 
-package-version:
+package-version: 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 "$(APP_NAME)" -v "$(VERSION)" "--maintainer=Ward Vandewege <ward@curoverse.com>" --description "workbench2 Package" --deb-no-default-config-files $(WORKSPACE)/build/=/var/www/arvados-workbench2/workbench2/
        @fpm -s dir -t rpm  -n "$(APP_NAME)" -v "$(VERSION)" "--maintainer=Ward Vandewege <ward@curoverse.com>" --description "workbench2 Package" $(WORKSPACE)/build/=/var/www/arvados-workbench2/workbench2/
 
-package-no-version:
+package-no-version: 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 "$(APP_NAME)" -v "$(CI_VERSION)" "--maintainer=Ward Vandewege <ward@curoverse.com>" --description "workbench2 Package" --deb-no-default-config-files $(WORKSPACE)/build/=/var/www/arvados-workbench2/workbench2/
        @fpm -s dir -t rpm  -n "$(APP_NAME)" -v "$(CI_VERSION)" "--maintainer=Ward Vandewege <ward@curoverse.com>" --description "workbench2 Package" $(WORKSPACE)/build/=/var/www/arvados-workbench2/workbench2/