This is an automated email from the ASF dual-hosted git repository.

zhangliang2022 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git


The following commit(s) were added to refs/heads/main by this push:
     new 7ec971a7b fix(makefile): enable sub directory makefile in main 
directory (#4203)
7ec971a7b is described below

commit 7ec971a7b28440c3198bf386d051656cb3cba64f
Author: Warren Chen <[email protected]>
AuthorDate: Thu Jan 12 16:39:14 2023 +0800

    fix(makefile): enable sub directory makefile in main directory (#4203)
---
 Makefile         | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 backend/Makefile |  3 +++
 2 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index d7a9b5c02..c248fabb9 100644
--- a/Makefile
+++ b/Makefile
@@ -23,13 +23,13 @@ IMAGE_REPO ?= "apache"
 VERSION = $(TAG)@$(SHA)
 
 build-server-image:
-       docker build -t $(IMAGE_REPO)/devlake:$(TAG) --build-arg TAG=$(TAG) 
--build-arg SHA=$(SHA) --file ./Dockerfile .
+       make build-server-image -C backend
 
 build-config-ui-image:
        cd config-ui; docker build -t $(IMAGE_REPO)/devlake-config-ui:$(TAG) 
--file ./Dockerfile .
 
 build-grafana-image:
-       cd grafana; docker build -t $(IMAGE_REPO)/devlake-dashboard:$(TAG) 
--file ./Dockerfile .
+       cd grafana; docker build -t $(IMAGE_REPO)/devlake-dashboard:$(TAG) 
--file ./backend/Dockerfile .
 
 build-images: build-server-image build-config-ui-image build-grafana-image
 
@@ -55,3 +55,73 @@ commit:
 
 restart:
        docker-compose down; docker-compose up -d
+
+# Actually execute in ./backend
+go-dep:
+       make go-dep -C backend
+
+python-dep:
+       make python-dep -C backend
+
+dep: go-dep python-dep
+
+swag:
+       make swag -C backend
+
+build-plugin:
+       make build-plugin -C backend
+
+build-plugin-debug:
+       make build-plugin-debug -C backend
+
+build-worker:
+       make build-worker -C backend
+
+build-server:
+       make build-server -C backend
+
+build: build-plugin build-server
+
+all: build build-worker
+
+tap-models:
+       make tap-models -C backend
+
+run:
+       make run -C backend
+
+worker:
+       make worker -C backend
+
+dev:
+       make dev -C backend
+
+debug:
+       make debug -C backend
+
+mock:
+       make mock -C backend
+
+test: unit-test e2e-test
+
+unit-test: mock unit-test-only
+
+unit-test-only:
+       make unit-test-only -C backend
+
+e2e-test: build e2e-test-only
+
+e2e-test-only:
+       #PLUGIN_DIR=$(shell readlink -f bin/plugins) go test -timeout 300s -v 
./test/...
+
+e2e-plugins-test:
+       make e2e-plugins-test -C backend
+
+lint:
+       make lint -C backend
+
+fmt:
+       make fmt -C backend
+
+clean:
+       make clean -C backend
diff --git a/backend/Makefile b/backend/Makefile
index 0e2a70e65..763f48794 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -96,3 +96,6 @@ fmt:
 
 clean:
        @rm -rf bin
+
+build-server-image:
+       docker build -t $(IMAGE_REPO)/devlake:$(TAG) --build-arg TAG=$(TAG) 
--build-arg SHA=$(SHA) --file ./Dockerfile .

Reply via email to