Skip to content

Commit

Permalink
Merge branch 'master' into disable-yield-var
Browse files Browse the repository at this point in the history
  • Loading branch information
czpmango committed Nov 5, 2021
2 parents e7ffdea + 58f0b44 commit 7626e33
Show file tree
Hide file tree
Showing 13 changed files with 99 additions and 213 deletions.
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
*.md
LICENSES/
docs/

*.swp
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ on:
schedule:
- cron: '0 18 * * *'

concurrency:
group: nightly
cancel-in-progress: true

defaults:
run:
shell: bash
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ on:
- master
- 'v[0-9]+.*'

concurrency:
group: ${{ github.head_ref }}
cancel-in-progress: true

defaults:
run:
shell: bash
Expand All @@ -20,6 +24,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
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ on:
types:
- published

concurrency:
group: release
cancel-in-progress: true

defaults:
run:
shell: bash
Expand Down Expand Up @@ -33,6 +37,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
Expand Down Expand Up @@ -74,6 +80,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
Expand Down
46 changes: 46 additions & 0 deletions .licenserc.yaml
Original file line number Diff line number Diff line change
@@ -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
202 changes: 0 additions & 202 deletions LICENSES/Apache-2.0.txt

This file was deleted.

5 changes: 5 additions & 0 deletions scripts/meta-transfer-tools.sh
Original file line number Diff line number Diff line change
@@ -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=
Expand Down
5 changes: 5 additions & 0 deletions scripts/utils.sh
Original file line number Diff line number Diff line change
@@ -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=
Expand Down
7 changes: 5 additions & 2 deletions src/common/datatypes/EdgeOps-inl.h
Original file line number Diff line number Diff line change
@@ -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_
Expand Down
7 changes: 5 additions & 2 deletions src/common/datatypes/HostAddrOps-inl.h
Original file line number Diff line number Diff line change
@@ -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_
Expand Down
7 changes: 5 additions & 2 deletions src/common/datatypes/PathOps-inl.h
Original file line number Diff line number Diff line change
@@ -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_
Expand Down
7 changes: 5 additions & 2 deletions src/common/datatypes/ValueOps-inl.h
Original file line number Diff line number Diff line change
@@ -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_
Expand Down
7 changes: 5 additions & 2 deletions src/common/geo/GeoIndex.cpp
Original file line number Diff line number Diff line change
@@ -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"
Expand Down

0 comments on commit 7626e33

Please sign in to comment.