From: Fernando Monserrat <fernando.monserrat@gmail.com>
Date: Mon, 11 Jun 2018 20:54:07 +0000 (-0300)
Subject: 13544: add build to package creation target as dependency
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/b79b838997ca3ede1b7701734fd489ccdb2c5f3d

13544: add build to package creation target as dependency
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat@veritasgenetics.com>
---

diff --git a/Makefile b/Makefile
index 68d10574be..0e1cc82353 100644
--- 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/