You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by sp...@apache.org on 2021/05/11 11:41:40 UTC
[apisix] branch master updated: ci: move license & plugin style
check to separate job (#4211)
This is an automated email from the ASF dual-hosted git repository.
spacewander pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/master by this push:
new e4fd1cb ci: move license & plugin style check to separate job (#4211)
e4fd1cb is described below
commit e4fd1cb19899fd8e5d907c311b82ea952efb2296
Author: 罗泽轩 <sp...@gmail.com>
AuthorDate: Tue May 11 19:41:30 2021 +0800
ci: move license & plugin style check to separate job (#4211)
Signed-off-by: spacewander <sp...@gmail.com>
---
.github/workflows/lint.yml | 6 ++++++
ci/ASF-Release.cfg | 3 ---
ci/linux_openresty_common_runner.sh | 4 ----
ci/linux_openresty_mtls_runner.sh | 8 --------
ci/linux_tengine_runner.sh | 7 -------
5 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 50684a1..778ab6c 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -25,3 +25,9 @@ jobs:
- name: Merge conflict
run: |
grep "^<<<<<<< HEAD" $(git ls-files | grep -v "t/toolkit" | xargs) && exit 1 || true
+ - name: License
+ run: |
+ make license-check
+ - name: Plugin Code
+ run: |
+ sudo bash ./utils/check-plugins-code.sh
diff --git a/ci/ASF-Release.cfg b/ci/ASF-Release.cfg
index 7efd557..336be51 100644
--- a/ci/ASF-Release.cfg
+++ b/ci/ASF-Release.cfg
@@ -96,9 +96,6 @@ ci/openwhisk-utilities
# Exclude test toolkit files
t/toolkit
-# Exclude dashboard files
-dashboard
-
# Exclude subcomponents files
apisix/balancer/ewma.lua
diff --git a/ci/linux_openresty_common_runner.sh b/ci/linux_openresty_common_runner.sh
index e0e597c..b16f077 100755
--- a/ci/linux_openresty_common_runner.sh
+++ b/ci/linux_openresty_common_runner.sh
@@ -117,10 +117,6 @@ apisix:
./bin/apisix stop
sleep 1
- sudo bash ./utils/check-plugins-code.sh
-
- make license-check || exit 1
-
# APISIX_ENABLE_LUACOV=1 PERL5LIB=.:$PERL5LIB prove -Itest-nginx/lib -r t
FLUSH_ETCD=1 PERL5LIB=.:$PERL5LIB prove -Itest-nginx/lib -r t
}
diff --git a/ci/linux_openresty_mtls_runner.sh b/ci/linux_openresty_mtls_runner.sh
index 47c014d..a979f64 100755
--- a/ci/linux_openresty_mtls_runner.sh
+++ b/ci/linux_openresty_mtls_runner.sh
@@ -37,12 +37,6 @@ do_install() {
# tree deps
git clone https://github.com/iresty/test-nginx.git test-nginx
- make utils
-
- git clone https://github.com/apache/openwhisk-utilities.git ci/openwhisk-utilities
- cp ci/ASF* ci/openwhisk-utilities/scancode/
-
- ls -l ./
}
script() {
@@ -111,8 +105,6 @@ apisix:
./bin/apisix stop
sleep 1
-
- make license-check || exit 1
}
after_success() {
diff --git a/ci/linux_tengine_runner.sh b/ci/linux_tengine_runner.sh
index 9c1271c..05fbc04 100755
--- a/ci/linux_tengine_runner.sh
+++ b/ci/linux_tengine_runner.sh
@@ -208,12 +208,6 @@ do_install() {
./utils/linux-install-etcd-client.sh
git clone https://github.com/iresty/test-nginx.git test-nginx
- make utils
-
- git clone https://github.com/apache/openwhisk-utilities.git ci/openwhisk-utilities
- cp ci/ASF* ci/openwhisk-utilities/scancode/
-
- ls -l ./
}
script() {
@@ -231,7 +225,6 @@ script() {
sleep 1
./bin/apisix stop
sleep 1
- make license-check || exit 1
# APISIX_ENABLE_LUACOV=1 PERL5LIB=.:$PERL5LIB prove -Itest-nginx/lib -r t
}