merge

.build.ps1

@@ -8,6 +8,7 @@
 #
 # 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.
 

.github/.licenserc.yaml

@@ -0,0 +1,100 @@
+header:
+  license:
+    spdx-id: Apache-2.0
+    copyright-owner: PingCAP, Inc.
+  paths-ignore:
+    - 'docs/'
+    - 'br/'
+    - '.gitignore'
+    - '.gitattributes'
+    - '.golangci.yml'
+    - '.licenserc.yaml'
+    - 'LICENSES/'
+    - '**/*.md'
+    - '**/*.json'
+    - '**/*.pem'
+    - '**/*.crt'
+    - '**/*.test'
+    - '**/*.result'
+    - '**/*.example'
+    - '.codecov.yml'
+    - 'circle.yml'
+    - 'errors.toml'
+    - 'Jenkinsfile'
+    - '.editorconfig'
+    - 'hooks/pre-commit'
+    - '**/go.mod'
+    - '**/go.sum'
+    - 'LICENSE'
+    - '.github/'
+    # The license checker think the following 68 files do not have valid header licenses, need to be discussed.
+    # Ignore them for now.
+    - 'cmd/explaintest/config.toml'
+    - 'cmd/importer/config.toml'
+    - 'cmd/portgenerator/portgenerator.go'
+    - 'ddl/ddl.go'
+    - 'ddl/ddl_api.go'
+    - 'ddl/mock.go'
+    - 'ddl/options.go'
+    - 'executor/aggfuncs/func_stddevpop_test.go'
+    - 'executor/aggfuncs/func_stddevsamp_test.go'
+    - 'executor/aggfuncs/func_varpop_test.go'
+    - 'executor/aggfuncs/func_varsamp_test.go'
+    - 'executor/index_lookup_merge_join_test.go'
+    - 'executor/pkg_test.go'
+    - 'expression/aggregation/base_func_test.go'
+    - 'expression/aggregation/util_test.go'
+    - 'expression/builtin.go'
+    - 'expression/builtin_info.go'
+    - 'expression/builtin_math.go'
+    - 'expression/builtin_miscellaneous.go'
+    - 'expression/builtin_miscellaneous_test.go'
+    - 'expression/builtin_string.go'
+    - 'expression/builtin_time.go'
+    - 'metrics/alertmanager/tidb.rules.yml'
+    - 'metrics/topsql.go'
+    - 'planner/core/cache_test.go'
+    - 'planner/core/logical_plans_test.go'
+    - 'planner/core/partition_prune.go'
+    - 'planner/core/partition_pruning_test.go'
+    - 'planner/core/rule_aggregation_push_down.go'
+    - 'planner/core/rule_max_min_eliminate.go'
+    - 'planner/core/rule_partition_processor.go'
+    - 'planner/core/rule_predicate_push_down.go'
+    - 'planner/core/telemetry.go'
+    - 'plugin/conn_ip_example/manifest.toml'
+    - 'server/conn.go'
+    - 'server/conn_stmt.go'
+    - 'server/packetio.go'
+    - 'server/server.go'
+    - 'server/util.go'
+    - 'session/bootstrap.go'
+    - 'session/session.go'
+    - 'session/tidb.go'
+    - 'store/driver/kv_test.go'
+    - 'store/mockstore/unistore/config/config-template.toml'
+    - 'store/mockstore/unistore/server/server.go'
+    - 'table/column.go'
+    - 'table/table.go'
+    - 'table/tables/tables.go'
+    - 'tests/globalkilltest/config.toml'
+    - 'tests/readonlytest/readonly_test.go'
+    - 'tools/check/check-timeout.go'
+    - 'tools/check/revive.toml'
+    - 'types/convert.go'
+    - 'types/etc.go'
+    - 'types/fuzzMarshalJSON.go'
+    - 'types/fuzzNewBitLiteral.go'
+    - 'types/fuzzNewHexLiteral.go'
+    - 'util/collate/collate_bench_test.go'
+    - 'util/format/format.go'
+    - 'util/logutil/slow_query_logger.go'
+    - 'util/mvmap/fnv.go'
+    - 'util/prefix_helper.go'
+    - 'util/resourcegrouptag/resource_group_tag.go'
+    - 'util/set/set_with_memory_usage_test.go'
+    - 'util/testkit/fake.go'
+    - 'util/testleak/leaktest.go'
+    - 'util/timeutil/time_test.go'
+    - 'util/topsql/reporter/mock/server.go'
+  comment: on-failure

.github/pull_request_template.md

@@ -45,4 +45,6 @@ Documentation
 
 ### Release note <!-- bugfixes or new feature need a release note -->
 
-- <!-- Please write a release note here to describe the change you made when it is released to the users of TiDB. If your PR doesn't involve any change to TiDB(like test enhancements, RFC proposals...), you can write `No release note`. -->
+```release-note
+Please add a release note, or a 'None' if it is not needed.
+```

.github/workflows/bug-closed.yml

@@ -0,0 +1,29 @@
+name: Bug Closed
+
+on:
+  issues:
+    types:
+      - closed
+
+jobs:
+  label_issues:
+    if: |
+      contains(github.event.issue.labels.*.name, 'type/bug') &&
+      !(contains(join(github.event.issue.labels.*.name, ', '), 'affects-') &&
+        contains(join(github.event.issue.labels.*.name, ', '), 'backport-'))
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+      - name: Label issues
+        uses: andymckay/[email protected]
+        with:
+          add-labels: "needs-more-info"
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Add comment
+        uses: peter-evans/[email protected]
+        with:
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            Please check whether the issue should be labeled with 'affects-x.y' or 'backport-x.y.z', 
+            and then remove 'needs-more-info' label.

.github/workflows/license-checker.yml

@@ -0,0 +1,23 @@
+name: License checker
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  check-license:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Check License Header
+        uses: apache/skywalking-eyes@main
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          log: info
+          config: .github/.licenserc.yaml

.golangci.yml

@@ -0,0 +1,32 @@
+run:
+  timeout: 7m
+linters:
+  disable-all: true
+  enable:
+    - misspell
+    - ineffassign
+    - typecheck
+    - varcheck
+    - unused
+    - structcheck
+    - deadcode
+    - gosimple
+    - goimports
+    - errcheck
+    - staticcheck
+    - stylecheck
+    - gosec
+linters-settings:
+  staticcheck:
+    checks: ["S1002","S1004","S1007","S1009","S1010","S1012","S1019","S1020","S1021","S1024","S1030","SA2*","SA3*","SA4009","SA5*","SA6000","SA6001","SA6005", "-SA2002"]
+  stylecheck:
+    checks: ["-ST1003"]
+  gosec:
+    excludes:
+      - G601
+issues:
+  exclude-rules:
+    - path: _test\.go
+      linters:
+        - errcheck
+        - gosec

Dockerfile

@@ -8,6 +8,7 @@
 #
 # 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.