Merge branch '17426-plug-ins' refs #17426

[arvados-workbench2.git] / Makefile

diff --git a/Makefile b/Makefile
index 6cd906e0f8ed57d70934c6a7b4bb8809db9602f8..6cf9c29dad2cda5b56d61603d20d87da8124bfef 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,13 +17,15 @@ VERSION?=$(shell ./version-at-commit.sh HEAD)
 # changes in the package. (i.e. example config files externally added
 ITERATION?=1
 
-TARGETS?="centos7 debian8 debian9 debian10 ubuntu1404 ubuntu1604 ubuntu1804"
+TARGETS?="centos7 debian8 debian10 ubuntu1404 ubuntu1604 ubuntu1804 ubuntu2004"
+
+ARVADOS_DIRECTORY?=unset
 
 DESCRIPTION=Arvados Workbench2 - Arvados is a free and open source platform for big data science.
 MAINTAINER=Arvados Package Maintainers <packaging@arvados.org>
 
 # DEST_DIR will have the build package copied.
-DEST_DIR=/var/www/arvados-workbench2/workbench2/
+DEST_DIR=/var/www/$(APP_NAME)/workbench2/
 
 # Debian package file
 DEB_FILE=$(APP_NAME)_$(VERSION)-$(ITERATION)_amd64.deb
@@ -65,14 +67,14 @@ unit-tests: yarn-install
 
 integration-tests: yarn-install
        yarn run cypress install
-       $(WORKSPACE)/tools/run-integration-tests.sh
+       $(WORKSPACE)/tools/run-integration-tests.sh -a $(ARVADOS_DIRECTORY)
 
 integration-tests-in-docker: workbench2-build-image
        docker run -ti -v$(PWD):$(PWD) -w$(PWD) workbench2-build make integration-tests
 
 test: unit-tests integration-tests
 
-build:
+build: yarn-install
        VERSION=$(VERSION) yarn build
 
 $(DEB_FILE): build