From 28429a0ac5fc944acb2c8c538d024fb33f441516 Mon Sep 17 00:00:00 2001 From: "zhu.boxiang" Date: Wed, 29 Sep 2021 14:08:57 +0800 Subject: [PATCH] refactor: Remove -f of poetry build command 1. Remove -f of poetry build command. Merge two commands as 'poetry build'. 2. Update submodule for skyline-console Change-Id: I91a04439c3a605a0159890a4603684a785d7a90c --- Makefile | 3 +-- libs/skyline-apiserver/Makefile | 3 +-- libs/skyline-config/Makefile | 3 +-- libs/skyline-console | 2 +- libs/skyline-log/Makefile | 3 +-- libs/skyline-nginx/Makefile | 3 +-- libs/skyline-policy-manager/Makefile | 3 +-- 7 files changed, 7 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 8ef1dde..4603610 100644 --- a/Makefile +++ b/Makefile @@ -94,8 +94,7 @@ $(INSTALL_LIBS): .PHONY: package $(PACKAGE_LIBS) PACKAGE_LIBS := $(addsuffix .package,$(LIB_PATHS)) package: $(PACKAGE_LIBS) - poetry build -f wheel - poetry build -f sdist + poetry build $(PACKAGE_LIBS): $(MAKE) -C $(basename $@) package diff --git a/libs/skyline-apiserver/Makefile b/libs/skyline-apiserver/Makefile index 2c61181..d08202a 100644 --- a/libs/skyline-apiserver/Makefile +++ b/libs/skyline-apiserver/Makefile @@ -30,8 +30,7 @@ install: venv .PHONY: package package: - poetry build -f wheel - poetry build -f sdist + poetry build .PHONY: fmt diff --git a/libs/skyline-config/Makefile b/libs/skyline-config/Makefile index d8f7ea3..1ef5987 100644 --- a/libs/skyline-config/Makefile +++ b/libs/skyline-config/Makefile @@ -18,8 +18,7 @@ install: venv .PHONY: package package: - poetry build -f wheel - poetry build -f sdist + poetry build .PHONY: fmt diff --git a/libs/skyline-console b/libs/skyline-console index 1d430c8..1b9c23e 160000 --- a/libs/skyline-console +++ b/libs/skyline-console @@ -1 +1 @@ -Subproject commit 1d430c8f86190c7383d3498d958c7940b7faa4d7 +Subproject commit 1b9c23e5c286a263a673bfb0489053f296b42401 diff --git a/libs/skyline-log/Makefile b/libs/skyline-log/Makefile index d9231ee..da8cf40 100644 --- a/libs/skyline-log/Makefile +++ b/libs/skyline-log/Makefile @@ -19,8 +19,7 @@ install: venv .PHONY: package package: - poetry build -f wheel - poetry build -f sdist + poetry build .PHONY: fmt diff --git a/libs/skyline-nginx/Makefile b/libs/skyline-nginx/Makefile index d8f7ea3..1ef5987 100644 --- a/libs/skyline-nginx/Makefile +++ b/libs/skyline-nginx/Makefile @@ -18,8 +18,7 @@ install: venv .PHONY: package package: - poetry build -f wheel - poetry build -f sdist + poetry build .PHONY: fmt diff --git a/libs/skyline-policy-manager/Makefile b/libs/skyline-policy-manager/Makefile index 0a3417f..a5ae631 100644 --- a/libs/skyline-policy-manager/Makefile +++ b/libs/skyline-policy-manager/Makefile @@ -20,8 +20,7 @@ install: venv .PHONY: package package: - poetry build -f wheel - poetry build -f sdist + poetry build .PHONY: fmt