From 0c92e35b3fa7111634b3bf031e67c80dd03b862b Mon Sep 17 00:00:00 2001 From: lin Date: Thu, 10 Sep 2020 10:59:07 +0800 Subject: [PATCH 1/7] Increase the checking of .conf and .toml files. --- .actions/ASF-Release.cfg | 16 ++++++---------- compose/dashboard_conf/nginx.conf | 17 +++++++++++++++++ docker/nginx.conf | 17 +++++++++++++++++ 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/.actions/ASF-Release.cfg b/.actions/ASF-Release.cfg index bb6e8d7e94..6b4cd0bee3 100644 --- a/.actions/ASF-Release.cfg +++ b/.actions/ASF-Release.cfg @@ -32,10 +32,11 @@ ASFLicenseHeaderLua.txt *.swift=no_tabs, has_block_license, eol_at_eof, regex_check *.yaml=has_block_license, eol_at_eof, regex_check *.yml=has_block_license, eol_at_eof, regex_check -*.css=has_block_license, regex_check -*.tsx=has_block_license, regex_check -*.ts=has_block_license, regex_check -*.less=has_block_license, regex_check +*.css=has_block_license, eol_at_eof, regex_check +*.tsx=has_block_license, eol_at_eof, regex_check +*.ts=has_block_license, eol_at_eof, regex_check +*.less=has_block_license, eol_at_eof, regex_check +*.toml=has_block_license, eol_at_eof, regex_check *Dockerfile*=has_block_license # Sanity check files not required to have ASF headers because either they @@ -76,15 +77,10 @@ src/e2e/__mocks__/antd-pro-merge-less.js src/e2e/baseLayout.e2e.js src/pages/404.tsx src/service-worker.js -compose/dashboard_conf/nginx.conf -docker/nginx.conf - -# The README.md file cannot be found, but it will be detected -dag-to-lua-1.1/README.md +# Skip the "build.sh" file. Because "license" is not at the beginning of the file api/build.sh - # Exclude Apache standard legal files CREDITS.txt DISCLAIMER.txt diff --git a/compose/dashboard_conf/nginx.conf b/compose/dashboard_conf/nginx.conf index 3735dd8de2..dcdfde825e 100644 --- a/compose/dashboard_conf/nginx.conf +++ b/compose/dashboard_conf/nginx.conf @@ -1,3 +1,20 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + server { listen 80; # gzip config diff --git a/docker/nginx.conf b/docker/nginx.conf index 3848aa6dcb..a596506f1f 100644 --- a/docker/nginx.conf +++ b/docker/nginx.conf @@ -1,3 +1,20 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + server { listen 80; # gzip config From fe36ceee90825a25494c0888e3576a761c5137c1 Mon Sep 17 00:00:00 2001 From: lin Date: Thu, 10 Sep 2020 11:35:07 +0800 Subject: [PATCH 2/7] Skip the check of dag-to-lua-1.1/README.md file --- .actions/ASF-Release.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.actions/ASF-Release.cfg b/.actions/ASF-Release.cfg index 6b4cd0bee3..9d42675f07 100644 --- a/.actions/ASF-Release.cfg +++ b/.actions/ASF-Release.cfg @@ -81,6 +81,9 @@ src/service-worker.js # Skip the "build.sh" file. Because "license" is not at the beginning of the file api/build.sh +# The README.md file cannot be found, but it will be check +dag-to-lua-1.1/README.md + # Exclude Apache standard legal files CREDITS.txt DISCLAIMER.txt From 6cb845f827a8de868ef75451fe68a52956155f94 Mon Sep 17 00:00:00 2001 From: lin Date: Thu, 10 Sep 2020 11:45:03 +0800 Subject: [PATCH 3/7] Put the "run Makefile" check before "get lua lib". --- .github/workflows/api_ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/api_ci.yml b/.github/workflows/api_ci.yml index ac0829ceab..684f541665 100644 --- a/.github/workflows/api_ci.yml +++ b/.github/workflows/api_ci.yml @@ -54,6 +54,10 @@ jobs: run: | curl 127.0.0.1:9080 + - name: run Makefile + run: | + make license-check + - name: get lua lib run: | wget https://github.com/api7/dag-to-lua/archive/v1.1.tar.gz @@ -74,7 +78,4 @@ jobs: working-directory: ./api run: | go test ./... - - - name: run Makefile - run: | - make license-check + \ No newline at end of file From 47e34080bcdb16191495ba13108aa50724d5863e Mon Sep 17 00:00:00 2001 From: lin Date: Thu, 10 Sep 2020 11:46:37 +0800 Subject: [PATCH 4/7] Put the "run Makefile" check before "get lua lib". --- .github/workflows/api_ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/api_ci.yml b/.github/workflows/api_ci.yml index 684f541665..0cec7eeaf6 100644 --- a/.github/workflows/api_ci.yml +++ b/.github/workflows/api_ci.yml @@ -78,4 +78,3 @@ jobs: working-directory: ./api run: | go test ./... - \ No newline at end of file From c02ddfa2e1d5a64a9939ffd313f6662c053b4fdf Mon Sep 17 00:00:00 2001 From: lin Date: Thu, 10 Sep 2020 11:51:03 +0800 Subject: [PATCH 5/7] Put the "run Makefile" check before "get lua lib". --- .actions/ASF-Release.cfg | 3 --- 1 file changed, 3 deletions(-) diff --git a/.actions/ASF-Release.cfg b/.actions/ASF-Release.cfg index 9d42675f07..6b4cd0bee3 100644 --- a/.actions/ASF-Release.cfg +++ b/.actions/ASF-Release.cfg @@ -81,9 +81,6 @@ src/service-worker.js # Skip the "build.sh" file. Because "license" is not at the beginning of the file api/build.sh -# The README.md file cannot be found, but it will be check -dag-to-lua-1.1/README.md - # Exclude Apache standard legal files CREDITS.txt DISCLAIMER.txt From 4fb1c79f49db21fbdd4f713f1ce33ee0f2665234 Mon Sep 17 00:00:00 2001 From: lin Date: Fri, 11 Sep 2020 01:41:29 +0800 Subject: [PATCH 6/7] Independent license check operationfile. --- .github/workflows/license_ci.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/license_ci.yml diff --git a/.github/workflows/license_ci.yml b/.github/workflows/license_ci.yml new file mode 100644 index 0000000000..49ecb4d41e --- /dev/null +++ b/.github/workflows/license_ci.yml @@ -0,0 +1,23 @@ +name: LICENSE CI + +on: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + + check_license: + + runs-on: ubuntu-latest + + steps: + + - uses: actions/checkout@v2 + + - name: run license check + run: | + make license-check From c759ff69a97bca1f24c38d00debb76b2a60336fa Mon Sep 17 00:00:00 2001 From: lin Date: Fri, 11 Sep 2020 01:56:09 +0800 Subject: [PATCH 7/7] Independent license check operationfile. --- .github/workflows/api_ci.yml | 4 ---- .github/workflows/license_ci.yml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/api_ci.yml b/.github/workflows/api_ci.yml index 0cec7eeaf6..32a365bf36 100644 --- a/.github/workflows/api_ci.yml +++ b/.github/workflows/api_ci.yml @@ -54,10 +54,6 @@ jobs: run: | curl 127.0.0.1:9080 - - name: run Makefile - run: | - make license-check - - name: get lua lib run: | wget https://github.com/api7/dag-to-lua/archive/v1.1.tar.gz diff --git a/.github/workflows/license_ci.yml b/.github/workflows/license_ci.yml index 49ecb4d41e..28a222ebd2 100644 --- a/.github/workflows/license_ci.yml +++ b/.github/workflows/license_ci.yml @@ -10,7 +10,7 @@ on: jobs: - check_license: + check-license: runs-on: ubuntu-latest