From 22a5fe912d74398b209be512d429d9be87dba5b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E5=BB=B6=E9=BE=99?= Date: Fri, 5 Nov 2021 10:17:46 +0800 Subject: [PATCH 1/3] Add license check (#3268) * [CI] Add license check * [CI] Add license check * [CI] Add license check * [CI] Add license check --- .github/workflows/pull_request.yml | 2 ++ .github/workflows/release.yml | 4 +++ .licenserc.yaml | 46 ++++++++++++++++++++++++++ scripts/meta-transfer-tools.sh | 5 +++ scripts/utils.sh | 5 +++ src/common/datatypes/EdgeOps-inl.h | 7 ++-- src/common/datatypes/HostAddrOps-inl.h | 7 ++-- src/common/datatypes/PathOps-inl.h | 7 ++-- src/common/datatypes/ValueOps-inl.h | 7 ++-- src/common/geo/GeoIndex.cpp | 7 ++-- 10 files changed, 87 insertions(+), 10 deletions(-) create mode 100644 .licenserc.yaml diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 7f8bda75acb..412c022ec4b 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -20,6 +20,8 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 2 + - name: Check License Header + uses: apache/skywalking-eyes@main - name: Cpplint run: | ln -snf $PWD/.linters/cpp/hooks/pre-commit.sh $PWD/.linters/cpp/pre-commit.sh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 31cd8c41921..823b5d92f2d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,6 +33,8 @@ jobs: with: run: sh -c "find . -mindepth 1 -delete" - uses: actions/checkout@v2 + - name: Check License Header + uses: apache/skywalking-eyes@main - uses: ./.github/actions/tagname-action id: tag - name: package @@ -74,6 +76,8 @@ jobs: with: run: sh -c "find . -mindepth 1 -delete" - uses: actions/checkout@v2 + - name: Check License Header + uses: apache/skywalking-eyes@main - uses: ./.github/actions/tagname-action id: tagname - id: docker diff --git a/.licenserc.yaml b/.licenserc.yaml new file mode 100644 index 00000000000..d1556265c78 --- /dev/null +++ b/.licenserc.yaml @@ -0,0 +1,46 @@ +# +# Copyright (c) 2020 vesoft inc. All rights reserved. +# +# This source code is licensed under Apache 2.0 License. +header: + license: + spdx-id: Apache-2.0 + copyright-owner: vesoft inc + content: | + + Copyright (c) 2020 vesoft inc. All rights reserved. + + This source code is licensed under Apache 2.0 License. + + pattern: | + + Copyright (c) \d{4} vesoft inc. All rights reserved. + + This source code is licensed under Apache 2.0 License. + + paths-ignore: + - '.licenserc.yaml' + - '.clang-tidy' + - '.dockerignore' + - '**/.gitignore' + - 'cmake' + - 'conf' + - 'docker' + - 'package' + - 'resources/*.csv' + - 'resources/*.json' + - 'scripts/*.service' + - 'src/**/*.thrift' + - 'src/**/*.lex' + - 'src/**/*.yy' + - 'src/**/*.dict' + - 'src/**/*.in' + - 'tests' + - '.github' + - '.linters' + - '**/*.md' + - 'third-party' + - 'LICENSE' + - 'NOTICE' + + comment: on-failure diff --git a/scripts/meta-transfer-tools.sh b/scripts/meta-transfer-tools.sh index 9925c8aa363..3bb316d47af 100755 --- a/scripts/meta-transfer-tools.sh +++ b/scripts/meta-transfer-tools.sh @@ -1,4 +1,9 @@ #! /bin/bash +# +# Copyright (c) 2020 vesoft inc. All rights reserved. +# +# This source code is licensed under Apache 2.0 License. +# src= dst= diff --git a/scripts/utils.sh b/scripts/utils.sh index 55f7df6a629..1d115ac7b56 100644 --- a/scripts/utils.sh +++ b/scripts/utils.sh @@ -1,3 +1,8 @@ +# +# Copyright (c) 2020 vesoft inc. All rights reserved. +# +# This source code is licensed under Apache 2.0 License. +# # Some color code definitions RED= GREEN= diff --git a/src/common/datatypes/EdgeOps-inl.h b/src/common/datatypes/EdgeOps-inl.h index c5ad128a330..f86ec5fbcf3 100644 --- a/src/common/datatypes/EdgeOps-inl.h +++ b/src/common/datatypes/EdgeOps-inl.h @@ -1,6 +1,9 @@ -/* Copyright (c) 2020 vesoft inc. All rights reserved. +/* + * + * Copyright (c) 2020 vesoft inc. All rights reserved. + * + * This source code is licensed under Apache 2.0 License. * - * obj source code is licensed under Apache 2.0 License. */ #ifndef COMMON_DATATYPES_EDGEOPS_H_ diff --git a/src/common/datatypes/HostAddrOps-inl.h b/src/common/datatypes/HostAddrOps-inl.h index cabe2193234..47f8554b7f2 100644 --- a/src/common/datatypes/HostAddrOps-inl.h +++ b/src/common/datatypes/HostAddrOps-inl.h @@ -1,6 +1,9 @@ -/* Copyright (c) 2020 vesoft inc. All rights reserved. +/* + * + * Copyright (c) 2020 vesoft inc. All rights reserved. + * + * This source code is licensed under Apache 2.0 License. * - * obj source code is licensed under Apache 2.0 License. */ #ifndef COMMON_DATATYPES_HOSTADDROPS_H_ diff --git a/src/common/datatypes/PathOps-inl.h b/src/common/datatypes/PathOps-inl.h index ff3b55e1cb7..a22074bf995 100644 --- a/src/common/datatypes/PathOps-inl.h +++ b/src/common/datatypes/PathOps-inl.h @@ -1,6 +1,9 @@ -/* Copyright (c) 2020 vesoft inc. All rights reserved. +/* + * + * Copyright (c) 2020 vesoft inc. All rights reserved. + * + * This source code is licensed under Apache 2.0 License. * - * obj source code is licensed under Apache 2.0 License. */ #ifndef COMMON_DATATYPES_PATHOPS_H_ diff --git a/src/common/datatypes/ValueOps-inl.h b/src/common/datatypes/ValueOps-inl.h index 0e7dde8ecae..0fa5729be13 100644 --- a/src/common/datatypes/ValueOps-inl.h +++ b/src/common/datatypes/ValueOps-inl.h @@ -1,6 +1,9 @@ -/* Copyright (c) 2020 vesoft inc. All rights reserved. +/* + * + * Copyright (c) 2020 vesoft inc. All rights reserved. + * + * This source code is licensed under Apache 2.0 License. * - * obj source code is licensed under Apache 2.0 License. */ #ifndef COMMON_DATATYPES_VALUEOPS_H_ diff --git a/src/common/geo/GeoIndex.cpp b/src/common/geo/GeoIndex.cpp index 72e8f842136..1d7e3249ef7 100644 --- a/src/common/geo/GeoIndex.cpp +++ b/src/common/geo/GeoIndex.cpp @@ -1,6 +1,9 @@ -/* Copyright (c) 2020 vesoft inc. All rights reserved. +/* + * + * Copyright (c) 2020 vesoft inc. All rights reserved. + * + * This source code is licensed under Apache 2.0 License. * - * This sourc_e code is licensed under Apache 2.0 License. */ #include "common/geo/GeoIndex.h" From 7e253961c0d31b2edd7085f30af427ee5330ef9c Mon Sep 17 00:00:00 2001 From: Yee <2520865+yixinglu@users.noreply.github.com> Date: Fri, 5 Nov 2021 14:54:51 +0800 Subject: [PATCH 2/3] Remove duplicate license files (#3276) --- .dockerignore | 1 - LICENSES/Apache-2.0.txt | 202 ---------------------------------------- 2 files changed, 203 deletions(-) delete mode 100644 LICENSES/Apache-2.0.txt diff --git a/.dockerignore b/.dockerignore index 07bc73cd16c..7cc234ab2f3 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,4 @@ *.md -LICENSES/ docs/ *.swp diff --git a/LICENSES/Apache-2.0.txt b/LICENSES/Apache-2.0.txt deleted file mode 100644 index d6456956733..00000000000 --- a/LICENSES/Apache-2.0.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed 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. From 58f0b440c8cef4eff7cfb1d52b1d4fc20cf29ec8 Mon Sep 17 00:00:00 2001 From: Yee <2520865+yixinglu@users.noreply.github.com> Date: Fri, 5 Nov 2021 16:50:09 +0800 Subject: [PATCH 3/3] Limit workflow job concurrency (#3277) * Limit workflow job concurrency https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions#concurrency * Limit workflow * Use workflow level concurrency --- .github/workflows/nightly.yml | 4 ++++ .github/workflows/pull_request.yml | 4 ++++ .github/workflows/release.yml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 8ef61324fce..947a55d1a75 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -4,6 +4,10 @@ on: schedule: - cron: '0 18 * * *' +concurrency: + group: nightly + cancel-in-progress: true + defaults: run: shell: bash diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 412c022ec4b..55dfa57a1c4 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -7,6 +7,10 @@ on: - master - 'v[0-9]+.*' +concurrency: + group: ${{ github.head_ref }} + cancel-in-progress: true + defaults: run: shell: bash diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 823b5d92f2d..fd748970dea 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,6 +5,10 @@ on: types: - published +concurrency: + group: release + cancel-in-progress: true + defaults: run: shell: bash