From d1d683d326f597be8276df45aa8b7f7f6ae7d265 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 23 Aug 2023 14:39:27 -0400 Subject: [PATCH] 18874: Use provided GOPATH, if any, in workbench2 Makefile recipe. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- services/workbench2/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/workbench2/Makefile b/services/workbench2/Makefile index 0b1b2381ef..569977abf1 100644 --- a/services/workbench2/Makefile +++ b/services/workbench2/Makefile @@ -6,6 +6,7 @@ SHELL := /bin/bash .ONESHELL: +GOPATH?=~/go APP_NAME?=arvados-workbench2 # VERSION uses all the above to produce X.Y.Z.timestamp @@ -68,8 +69,8 @@ arvados-server-install: check-arvados-directory cd cmd/arvados-server go install cd - - ls -l ~/go/bin/arvados-server - ~/go/bin/arvados-server install -type test + ls -l $(GOPATH)/bin/arvados-server + $(GOPATH)/bin/arvados-server install -type test yarn-install: arvados-server-install yarn install -- 2.30.2