[skywalking-kubernetes] branch master updated: makefile update

2019-12-18 Thread wusheng
This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git


The following commit(s) were added to refs/heads/master by this push:
 new 9172b4f  makefile update
 new aa66e88  Merge pull request #34 from innerpeacez/makefile
9172b4f is described below

commit 9172b4fa1ec6542f0409f582990a8ddd00b8bcdb
Author: innerpeacez 
AuthorDate: Wed Dec 18 21:38:27 2019 +0800

makefile update
---
 Makefile | 27 +++
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 8fe65be..28dfa54 100644
--- a/Makefile
+++ b/Makefile
@@ -21,18 +21,29 @@ CHART_NAME = skywalking-${VERSION}
 
 RELEASE_SRC = skywalking-kubernetes-${VERSION}-src
 
-package:
-$(shell helm package ${CHART_DIR})
+prepare:
+   cp -R NOTICE ${CHART_DIR}/NOTICE
+   cp -R LICENSE ${CHART_DIR}/LICENSE
+
+package: prepare
+   helm dep up ${CHART_DIR}
+   helm package ${CHART_DIR}
+   rm -rf ${CHART_DIR}/NOTICE
+   rm -rf ${CHART_DIR}/LICENSE
 
 clean:
-   -rm -rf bin/ \
-   -rm -rf ${CHART_NAME}.tgz \
-   -rm -rf ${RELEASE_SRC}.tgz \
-   -rm -rf ${RELEASE_SRC}.tgz.asc \
-   -rm -rf ${RELEASE_SRC}.tgz.sha512
+   rm -rf bin/ \
+   rm -rf ${CHART_DIR}/NOTICE \
+   rm -rf ${CHART_DIR}/LICENSE \
+   rm -rf ${CHART_NAME}.tgz \
+   rm -rf ${CHART_NAME}.tgz.asc \
+   rm -rf ${CHART_NAME}.tgz.sha512 \
+   rm -rf ${RELEASE_SRC}.tgz \
+   rm -rf ${RELEASE_SRC}.tgz.asc \
+   rm -rf ${RELEASE_SRC}.tgz.sha512
 
 release-src: package
-   -tar -zcvf $(RELEASE_SRC).tgz \
+   tar -zcvf $(RELEASE_SRC).tgz \
--exclude bin \
--exclude .git \
--exclude .idea \



[skywalking-kubernetes] branch master updated: makefile update

2019-12-16 Thread wusheng
This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git


The following commit(s) were added to refs/heads/master by this push:
 new eb75171  makefile update
 new cbb2600  Merge pull request #33 from innerpeacez/modify-makefile
eb75171 is described below

commit eb75171329c5dfdb1614f7a698bbfb2848d51e87
Author: innerpeacez 
AuthorDate: Mon Dec 16 17:51:26 2019 +0800

makefile update
---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index 35dc361..8fe65be 100644
--- a/Makefile
+++ b/Makefile
@@ -44,3 +44,5 @@ release-src: package
 release: release-src
gpg --batch --yes --armor --detach-sig $(RELEASE_SRC).tgz
shasum -a 512 $(RELEASE_SRC).tgz > $(RELEASE_SRC).tgz.sha512
+   gpg --batch --yes --armor --detach-sig $(CHART_NAME).tgz
+   shasum -a 512 $(CHART_NAME).tgz > $(CHART_NAME).tgz.sha512
\ No newline at end of file