From 81284ed057a03a9129d6398dcb3996a0aacbf4a8 Mon Sep 17 00:00:00 2001 From: Miguel de la Cruz Date: Fri, 24 Sep 2021 21:01:05 +0200 Subject: [PATCH] Remove indir directive as it's causing problems in OSX systems (#1328) --- modd-servertest.conf | 3 +-- modd-watchplugin.conf | 6 ++---- modd.conf | 8 +++----- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/modd-servertest.conf b/modd-servertest.conf index 1d6aee10d..933fb66c2 100644 --- a/modd-servertest.conf +++ b/modd-servertest.conf @@ -1,4 +1,3 @@ **/*.go { - indir: server - prep: go test -race -v ./... + prep: cd server && go test -race -v ./... } diff --git a/modd-watchplugin.conf b/modd-watchplugin.conf index da0723db6..340226171 100644 --- a/modd-watchplugin.conf +++ b/modd-watchplugin.conf @@ -1,9 +1,7 @@ **/*.go !**/*_test.go !mattermost-plugin/server/manifest.go { - indir: mattermost-plugin - prep: make server deploy-from-watch + prep: cd mattermost-plugin && make server deploy-from-watch } { - indir: mattermost-plugin - daemon +sigterm: make watch + daemon +sigterm: cd mattermost-plugin && make watch } diff --git a/modd.conf b/modd.conf index 94112d3e8..930f724cd 100644 --- a/modd.conf +++ b/modd.conf @@ -1,10 +1,8 @@ **/*.go !**/*_test.go { - indir: server - prep: go build -o ../bin/focalboard-server ./main - daemon +sigterm: cd .. && ./bin/focalboard-server $FOCALBOARDSERVER_ARGS + prep: cd server && go build -o ../bin/focalboard-server ./main + daemon +sigterm: ./bin/focalboard-server $FOCALBOARDSERVER_ARGS } { - indir: webapp - daemon: npm run watchdev + daemon: cd webapp && npm run watchdev }