20452: don't set path if currentItemUuid is not a collection

[arvados-workbench2.git] / Makefile

diff --git a/Makefile b/Makefile
index ab58fc580cc53e7d11dadb020c51b202218a9712..07c3b200ea5258a7aa97fd50634f19a2d7175eeb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,9 @@ APP_NAME?=arvados-workbench2
 # something in the lines of 1.2.0.20180612145021, this will be the package version
 # it can be overwritten when invoking make as in make packages VERSION=1.2.0
 VERSION?=$(shell ./version-at-commit.sh HEAD)
+# We don't use BUILD_NUMBER at the moment, but it needs to be defined
+BUILD_NUMBER?=0
+GIT_COMMIT?=$(shell git rev-parse --short HEAD)
 
 # ITERATION is the package iteration, intended for manual change if anything non-code related
 # changes in the package. (i.e. example config files externally added
@@ -65,6 +68,7 @@ arvados-server-install:
        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
@@ -78,12 +82,12 @@ integration-tests: yarn-install
        $(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
 
 build: yarn-install
-       VERSION=$(VERSION) yarn build
+       VERSION=$(VERSION) BUILD_NUMBER=$(BUILD_NUMBER) GIT_COMMIT=$(GIT_COMMIT) yarn build
 
 $(DEB_FILE): build
        fpm \
@@ -132,7 +136,11 @@ copy: $(DEB_FILE) $(RPM_FILE)
 # use FPM to create DEB and RPM
 packages: copy
 
-packages-in-docker: workbench2-build-image
+check-arvados-directory:
+       @if test "${ARVADOS_DIRECTORY}" == "unset"; then echo "the environment variable ARVADOS_DIRECTORY must be set to the path of an arvados git checkout"; exit 1; fi
+       @if ! test -d "${ARVADOS_DIRECTORY}"; then echo "the environment variable ARVADOS_DIRECTORY does not point at a directory"; exit 1; fi
+
+packages-in-docker: check-arvados-directory workbench2-build-image
        docker run --env ci="true" \
                --env ARVADOS_DIRECTORY=/tmp/arvados \
                --env APP_NAME=${APP_NAME} \