From 09c6bfd28eda5300581cd394a2b81f64739d52b1 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Mon, 16 Oct 2023 14:34:49 +0800 Subject: [PATCH 01/23] Renovate/configure (#9) * Update Makefile * Add renovate.json --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- renovate.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000000000..39a2b6e9a55b8 --- /dev/null +++ b/renovate.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:base" + ] +} From aa43157deb475a2a1a5ad3568f62badb6eb57254 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Mon, 16 Oct 2023 15:12:55 +0800 Subject: [PATCH 02/23] Renovate/configure (#9) (#13) * Update Makefile * Add renovate.json --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> ### What problem does this PR solve? Issue Number: close #xxx Problem Summary: ### What is changed and how it works? ### Check List Tests - [ ] Unit test - [ ] Integration test - [ ] Manual test (add detailed scripts or steps below) - [ ] No need to test > - [ ] I checked and no code files have been changed. > Side effects - [ ] Performance regression: Consumes more CPU - [ ] Performance regression: Consumes more Memory - [ ] Breaking backward compatibility Documentation - [ ] Affects user behaviors - [ ] Contains syntax changes - [ ] Contains variable changes - [ ] Contains experimental features - [ ] Changes MySQL compatibility ### Release note Please refer to [Release Notes Language Style Guide](https://pingcap.github.io/tidb-dev-guide/contribute-to-tidb/release-notes-style-guide.html) to write a quality release note. ```release-note None ``` --- renovate.json => .github/renovate.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) rename renovate.json => .github/renovate.json (50%) diff --git a/renovate.json b/.github/renovate.json similarity index 50% rename from renovate.json rename to .github/renovate.json index 39a2b6e9a55b8..a05b9a72ec274 100644 --- a/renovate.json +++ b/.github/renovate.json @@ -2,5 +2,11 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ "config:base" - ] + ], + "bazel": { + "fileMatch": [ + "(^|/)WORKSPACE(|\\.bazel)$", + "\\.bzl$" + ] + } } From 774880512009fd467ca44c31bfbfe48776c5896c Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Mon, 16 Oct 2023 16:34:36 +0800 Subject: [PATCH 03/23] try to update DEPS.bzl file (#39) --- .github/renovate.json | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index a05b9a72ec274..81d1ae4ff67ee 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -5,8 +5,13 @@ ], "bazel": { "fileMatch": [ - "(^|/)WORKSPACE(|\\.bazel)$", "\\.bzl$" - ] - } + ] + }, + "packageRules": [ + { + "matchCategories": ["bazel", "golang"], + "groupName": "gg" + } + ] } From ca3a694925aed5a9d26fb92e59050933e3b4fe11 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Wed, 18 Oct 2023 11:17:39 +0800 Subject: [PATCH 04/23] Update renovate.json (#47) --- .github/renovate.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/renovate.json b/.github/renovate.json index 81d1ae4ff67ee..18c6c9dfcd73b 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -8,6 +8,9 @@ "\\.bzl$" ] }, + "git-submodules": { + "enabled": true + }, "packageRules": [ { "matchCategories": ["bazel", "golang"], From 1ff25cc264a08743b75eca34d75aaa9869a664d6 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Wed, 18 Oct 2023 11:26:32 +0800 Subject: [PATCH 05/23] Update renovate.json --- .github/renovate.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/renovate.json b/.github/renovate.json index 18c6c9dfcd73b..71fda90f50e42 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -6,7 +6,8 @@ "bazel": { "fileMatch": [ "\\.bzl$" - ] + ], + "ignorePaths": ["(^|/)WORKSPACE(|\\.bazel)$",] }, "git-submodules": { "enabled": true From c64f0806bdd33579ad9aac04e11f51ee2ae080e1 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Wed, 18 Oct 2023 11:26:43 +0800 Subject: [PATCH 06/23] Update renovate.json --- .github/renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/renovate.json b/.github/renovate.json index 71fda90f50e42..67ede3fc98b66 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -7,7 +7,7 @@ "fileMatch": [ "\\.bzl$" ], - "ignorePaths": ["(^|/)WORKSPACE(|\\.bazel)$",] + "ignorePaths": ["(^|/)WORKSPACE(|\\.bazel)$"] }, "git-submodules": { "enabled": true From cb102f088af4d4525aa87dd490298b4f48f4810e Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Wed, 18 Oct 2023 12:14:14 +0800 Subject: [PATCH 07/23] Update .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 1d3a0208fe1ef..ef3eca6a0e239 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "extension/enterprise"] path = pkg/extension/enterprise - url = git@github.com:pingcap-inc/enterprise-extensions.git + url = git@github.com:wuhuizuo/enterprise-extensions.git From b7009b2c581becf2009057c8396dd8a2e015eba9 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Thu, 14 Sep 2023 17:03:22 +0800 Subject: [PATCH 08/23] bindinfo: add `OWNERS` file Fixes #46969 Signed-off-by: wuhuizuo --- OWNERS_ALIASES | 5 +++++ pkg/bindinfo/OWNERS | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 pkg/bindinfo/OWNERS diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index c679c70f9c91d..843c172325461 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -12,6 +12,11 @@ aliases: sig-approvers-autoid-service: # approvers for auto-id service - bb7133 - tiancaiamao + sig-approvers-bindinfo: # approvers for bindinfo module + - chrysan + - fixdb + - winoros + - qw4990 sig-approvers-br: # approvers for br module - BornChanger - 3pointer diff --git a/pkg/bindinfo/OWNERS b/pkg/bindinfo/OWNERS new file mode 100644 index 0000000000000..dfa9eadb52154 --- /dev/null +++ b/pkg/bindinfo/OWNERS @@ -0,0 +1,5 @@ +# See the OWNERS docs at https://go.k8s.io/owners +options: + no_parent_owners: true +approvers: + - sig-approvers-bindinfo From 4dea4c3a5f9d80cb6f62899d75049d171e001af9 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Thu, 14 Sep 2023 17:05:16 +0800 Subject: [PATCH 09/23] planner: add `OWNERS` file Fixes #46970 Signed-off-by: wuhuizuo --- pkg/planner/OWNERS | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 pkg/planner/OWNERS diff --git a/pkg/planner/OWNERS b/pkg/planner/OWNERS new file mode 100644 index 0000000000000..5179cd499c23a --- /dev/null +++ b/pkg/planner/OWNERS @@ -0,0 +1,5 @@ +# See the OWNERS docs at https://go.k8s.io/owners +options: + no_parent_owners: true +approvers: + - sig-approvers-planner From 6cdc99b75bda3528c225b8e846afe2a66158b5f1 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Thu, 14 Sep 2023 17:05:40 +0800 Subject: [PATCH 10/23] statistics: add `OWNERS` file Fixes #46971 Signed-off-by: wuhuizuo --- OWNERS_ALIASES | 10 ++++++++++ pkg/statistics/OWNERS | 5 +++++ 2 files changed, 15 insertions(+) create mode 100644 pkg/statistics/OWNERS diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index 843c172325461..5c52e495b6c68 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -126,3 +126,13 @@ aliases: - Benjamin2037 - gmhdbjd - lichunzhu + sig-approvers-planner: # approvers for planner module + - chrysan + - fixdb + - winoros + - qw4990 + sig-approvers-statistics: # approvers for statistics module + - chrysan + - fixdb + - winoros + - qw4990 diff --git a/pkg/statistics/OWNERS b/pkg/statistics/OWNERS new file mode 100644 index 0000000000000..390c9627fbdbc --- /dev/null +++ b/pkg/statistics/OWNERS @@ -0,0 +1,5 @@ +# See the OWNERS docs at https://go.k8s.io/owners +options: + no_parent_owners: true +approvers: + - sig-approvers-statistics From e562d8c263edd287d8ebbfb557ef9e0089d695ca Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Sat, 16 Sep 2023 10:39:10 +0800 Subject: [PATCH 11/23] Update OWNERS_ALIASES --- OWNERS_ALIASES | 1 - 1 file changed, 1 deletion(-) diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index 5c52e495b6c68..940837c43090f 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -132,7 +132,6 @@ aliases: - winoros - qw4990 sig-approvers-statistics: # approvers for statistics module - - chrysan - fixdb - winoros - qw4990 From 6bf8913b1c0ba59c2902f77ccdcd6cf7a32c67be Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Sat, 16 Sep 2023 10:39:18 +0800 Subject: [PATCH 12/23] Update OWNERS_ALIASES --- OWNERS_ALIASES | 1 - 1 file changed, 1 deletion(-) diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index 940837c43090f..5f96fed3ed72a 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -127,7 +127,6 @@ aliases: - gmhdbjd - lichunzhu sig-approvers-planner: # approvers for planner module - - chrysan - fixdb - winoros - qw4990 From 1d6994ff897eff3d87fed6de734c050a41b46a47 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Sat, 16 Sep 2023 10:39:42 +0800 Subject: [PATCH 13/23] Update OWNERS_ALIASES --- OWNERS_ALIASES | 1 - 1 file changed, 1 deletion(-) diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index 5f96fed3ed72a..f5d93dc279473 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -13,7 +13,6 @@ aliases: - bb7133 - tiancaiamao sig-approvers-bindinfo: # approvers for bindinfo module - - chrysan - fixdb - winoros - qw4990 From 90838c09deeb15d32ad3be8a938f72b2b5a48dc8 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Thu, 19 Oct 2023 09:26:46 +0000 Subject: [PATCH 14/23] pkg/bindinfo,pkg/statics: update OWNERS files use approver alias `sig-approvers-planner` to reduce maintance seperate SIGs. --- OWNERS_ALIASES | 8 -------- pkg/bindinfo/OWNERS | 4 +++- pkg/planner/OWNERS | 2 ++ pkg/statistics/OWNERS | 4 +++- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index f5d93dc279473..d96d6c4cb068e 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -12,10 +12,6 @@ aliases: sig-approvers-autoid-service: # approvers for auto-id service - bb7133 - tiancaiamao - sig-approvers-bindinfo: # approvers for bindinfo module - - fixdb - - winoros - - qw4990 sig-approvers-br: # approvers for br module - BornChanger - 3pointer @@ -129,7 +125,3 @@ aliases: - fixdb - winoros - qw4990 - sig-approvers-statistics: # approvers for statistics module - - fixdb - - winoros - - qw4990 diff --git a/pkg/bindinfo/OWNERS b/pkg/bindinfo/OWNERS index dfa9eadb52154..904863f05e7fc 100644 --- a/pkg/bindinfo/OWNERS +++ b/pkg/bindinfo/OWNERS @@ -2,4 +2,6 @@ options: no_parent_owners: true approvers: - - sig-approvers-bindinfo + - sig-approvers-planner +labels: + - sig/planner diff --git a/pkg/planner/OWNERS b/pkg/planner/OWNERS index 5179cd499c23a..904863f05e7fc 100644 --- a/pkg/planner/OWNERS +++ b/pkg/planner/OWNERS @@ -3,3 +3,5 @@ options: no_parent_owners: true approvers: - sig-approvers-planner +labels: + - sig/planner diff --git a/pkg/statistics/OWNERS b/pkg/statistics/OWNERS index 390c9627fbdbc..904863f05e7fc 100644 --- a/pkg/statistics/OWNERS +++ b/pkg/statistics/OWNERS @@ -2,4 +2,6 @@ options: no_parent_owners: true approvers: - - sig-approvers-statistics + - sig-approvers-planner +labels: + - sig/planner From cb77c5bfb047bc3c355009b6ef58ea364c31a7a5 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Tue, 2 Apr 2024 08:43:58 +0000 Subject: [PATCH 15/23] Revert "Update .gitmodules" This reverts commit cb102f088af4d4525aa87dd490298b4f48f4810e. --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index ef3eca6a0e239..1d3a0208fe1ef 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "extension/enterprise"] path = pkg/extension/enterprise - url = git@github.com:wuhuizuo/enterprise-extensions.git + url = git@github.com:pingcap-inc/enterprise-extensions.git From dd2ee5fc3f9c9e22a309f8ba9d5a2e06324b047a Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Tue, 2 Apr 2024 08:44:16 +0000 Subject: [PATCH 16/23] Revert "Update renovate.json" This reverts commit c64f0806bdd33579ad9aac04e11f51ee2ae080e1. --- .github/renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/renovate.json b/.github/renovate.json index 67ede3fc98b66..71fda90f50e42 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -7,7 +7,7 @@ "fileMatch": [ "\\.bzl$" ], - "ignorePaths": ["(^|/)WORKSPACE(|\\.bazel)$"] + "ignorePaths": ["(^|/)WORKSPACE(|\\.bazel)$",] }, "git-submodules": { "enabled": true From d0371be31c85cbf0641c4cb81bb59cd245a1c871 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Tue, 2 Apr 2024 08:44:32 +0000 Subject: [PATCH 17/23] Revert "Update renovate.json" This reverts commit 1ff25cc264a08743b75eca34d75aaa9869a664d6. --- .github/renovate.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 71fda90f50e42..18c6c9dfcd73b 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -6,8 +6,7 @@ "bazel": { "fileMatch": [ "\\.bzl$" - ], - "ignorePaths": ["(^|/)WORKSPACE(|\\.bazel)$",] + ] }, "git-submodules": { "enabled": true From 274529874ff955f37be0b680e5a327a32057e17d Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Tue, 2 Apr 2024 08:44:48 +0000 Subject: [PATCH 18/23] Revert "Update renovate.json (#47)" This reverts commit ca3a694925aed5a9d26fb92e59050933e3b4fe11. --- .github/renovate.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 18c6c9dfcd73b..81d1ae4ff67ee 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -8,9 +8,6 @@ "\\.bzl$" ] }, - "git-submodules": { - "enabled": true - }, "packageRules": [ { "matchCategories": ["bazel", "golang"], From e92511dbc89f95457ac8d46a08f3c510a80180fb Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Tue, 2 Apr 2024 08:45:07 +0000 Subject: [PATCH 19/23] Revert "try to update DEPS.bzl file (#39)" This reverts commit 774880512009fd467ca44c31bfbfe48776c5896c. --- .github/renovate.json | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 81d1ae4ff67ee..a05b9a72ec274 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -5,13 +5,8 @@ ], "bazel": { "fileMatch": [ + "(^|/)WORKSPACE(|\\.bazel)$", "\\.bzl$" - ] - }, - "packageRules": [ - { - "matchCategories": ["bazel", "golang"], - "groupName": "gg" - } - ] + ] + } } From 5257f15e7fdeff1da4f07b1c18f3b45019aaafcd Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Tue, 2 Apr 2024 08:45:22 +0000 Subject: [PATCH 20/23] Revert "Renovate/configure (#9) (#13)" This reverts commit aa43157deb475a2a1a5ad3568f62badb6eb57254. --- .github/renovate.json => renovate.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) rename .github/renovate.json => renovate.json (50%) diff --git a/.github/renovate.json b/renovate.json similarity index 50% rename from .github/renovate.json rename to renovate.json index a05b9a72ec274..39a2b6e9a55b8 100644 --- a/.github/renovate.json +++ b/renovate.json @@ -2,11 +2,5 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ "config:base" - ], - "bazel": { - "fileMatch": [ - "(^|/)WORKSPACE(|\\.bazel)$", - "\\.bzl$" - ] - } + ] } From ee81f0bc3160151e7bb10e682396db080b0b695b Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Tue, 2 Apr 2024 08:45:33 +0000 Subject: [PATCH 21/23] Revert "Renovate/configure (#9)" This reverts commit 09c6bfd28eda5300581cd394a2b81f64739d52b1. --- renovate.json | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 renovate.json diff --git a/renovate.json b/renovate.json deleted file mode 100644 index 39a2b6e9a55b8..0000000000000 --- a/renovate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "config:base" - ] -} From 6dc64bb26651cbf8defa1d743860bf9b11cb347b Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Sun, 7 Apr 2024 09:56:59 +0800 Subject: [PATCH 22/23] Update OWNERS_ALIASES --- OWNERS_ALIASES | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index d96d6c4cb068e..441df8fbb5f0b 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -122,6 +122,11 @@ aliases: - gmhdbjd - lichunzhu sig-approvers-planner: # approvers for planner module + - Arenatlx + - elsa0520 - fixdb - - winoros + - hawkingrei + - hi-rustin - qw4990 + - time-and-fate + - winoros From 19b16a3bcbe3be8f9ad48c6b6bf3e632edd8453c Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Sun, 7 Apr 2024 13:59:54 +0800 Subject: [PATCH 23/23] Update OWNERS_ALIASES --- OWNERS_ALIASES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index 441df8fbb5f0b..26d44b7e83898 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -122,7 +122,7 @@ aliases: - gmhdbjd - lichunzhu sig-approvers-planner: # approvers for planner module - - Arenatlx + - AilinKid - elsa0520 - fixdb - hawkingrei