projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
19969: Pass required prop to generic input to allow disabling required asterisk on...
[arvados-workbench2.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 2236f9de4f78df396f3f0ba7be58d1cce726d44c..07c3b200ea5258a7aa97fd50634f19a2d7175eeb 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-68,6
+68,7
@@
arvados-server-install:
cd cmd/arvados-server
go install
cd -
cd cmd/arvados-server
go install
cd -
+ ls -l ~/go/bin/arvados-server
~/go/bin/arvados-server install -type test
yarn-install: arvados-server-install
~/go/bin/arvados-server install -type test
yarn-install: arvados-server-install
@@
-81,7
+82,7
@@
integration-tests: yarn-install
$(WORKSPACE)/tools/run-integration-tests.sh -a $(ARVADOS_DIRECTORY)
integration-tests-in-docker: workbench2-build-image
$(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
+ docker run -ti -v$(PWD):
/usr/src/workbench2 -v$(ARVADOS_DIRECTORY):/usr/src/arvados -w /usr/src/workbench2 -e ARVADOS_DIRECTORY=/usr/src/arvados
workbench2-build make integration-tests
test: unit-tests integration-tests
test: unit-tests integration-tests