From 880242ed93e5640acb6c3ce9ec3c27860de69da2 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Sat, 18 Mar 2023 17:44:23 +0800 Subject: [PATCH] update composer and readme --- README-en.md | 6 +++--- README.md | 4 ++-- captainhook.json | 3 --- composer.json | 11 ----------- 4 files changed, 5 insertions(+), 19 deletions(-) diff --git a/README-en.md b/README-en.md index a188423a..efe1833c 100755 --- a/README-en.md +++ b/README-en.md @@ -58,9 +58,9 @@ This project is based on the tradition of using the MIT License for old versions while the new version references source code from some other projects. Special thanks to: -- dixyes/lwmbs (Mulun Permissive License) -- swoole/swoole-cli (Apache 2.0 LICENSE+SWOOLE-CLI LICENSE) -- +- [dixyes/lwmbs](https://github.com/dixyes/lwmbs) (Mulun Permissive License) +- [swoole/swoole-cli](https://github.com/swoole/swoole-cli) (Apache 2.0 LICENSE+SWOOLE-CLI LICENSE) + Due to the special nature of this project, many other open source projects such as curl and protobuf will be used during the project compilation process, and they all have their own open source licenses. diff --git a/README.md b/README.md index 1c47e176..0ffa23c3 100755 --- a/README.md +++ b/README.md @@ -59,8 +59,8 @@ chmod +x spc 本项目依据旧版本惯例采用 MIT License 开源,新版本采用了部分项目的源代码做参考,特别感谢: -- dixyes/lwmbs(木兰宽松许可证) -- swoole/swoole-cli(Apache 2.0 LICENSE+SWOOLE-CLI LICENSE) +- [dixyes/lwmbs](https://github.com/dixyes/lwmbs)(木兰宽松许可证) +- [swoole/swoole-cli](https://github.com/swoole/swoole-cli)(Apache 2.0 LICENSE+SWOOLE-CLI LICENSE) 因本项目的特殊性,使用项目编译过程中会使用很多其他开源项目,例如 curl、protobuf 等,它们都有各自的开源协议。 请在编译完成后,使用命令 `dump-license`(TODO) 导出项目使用项目的开源协议,并遵守对应项目的 LICENSE。 diff --git a/captainhook.json b/captainhook.json index d352ee62..77be1d57 100644 --- a/captainhook.json +++ b/captainhook.json @@ -4,9 +4,6 @@ "actions": [ { "action": "composer analyse" - }, - { - "action": "composer test" } ] }, diff --git a/composer.json b/composer.json index 89b36f00..f4eb8822 100644 --- a/composer.json +++ b/composer.json @@ -24,17 +24,6 @@ ] }, "extra": { - "hooks": { - "post-merge": "composer install", - "pre-commit": [ - "echo committing as $(git config user.name)", - "composer cs-fix -- --diff" - ], - "pre-push": [ - "composer cs-fix -- --dry-run --diff", - "composer analyse" - ] - } }, "bin": [ "bin/spc"