From 90aaa65331b1c9a0408cc3b5800ef06f2e8ac49c Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Thu, 26 Sep 2024 15:48:06 +0900 Subject: [PATCH 01/22] =?UTF-8?q?chore:=20=E3=81=99=E3=81=B9=E3=81=A6?= =?UTF-8?q?=E3=81=AE=E4=BE=9D=E5=AD=98=E3=82=92Renovate=E3=81=AE=E5=AF=BE?= =?UTF-8?q?=E8=B1=A1=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- renovate.json | 41 -------------------------- renovate.json5 | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 41 deletions(-) delete mode 100644 renovate.json create mode 100644 renovate.json5 diff --git a/renovate.json b/renovate.json deleted file mode 100644 index f56767ea0..000000000 --- a/renovate.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "config:recommended" - ], - "timezone": "Asia/Tokyo", - "packageRules": [ - { - "groupSlug": "rust", - "groupName": "Rust", - "matchPackagePatterns": [ - "^rust-lang/rust$" - ] - }, - { - "groupSlug": "others", - "groupName": "Others", - "matchPackagePatterns": [ - "*" - ], - "excludePackagePatterns": [ - "^rust-lang/rust$" - ], - "dependencyDashboardApproval": true - } - ], - "customManagers": [ - { - "customType": "regex", - "fileMatch": [ - "^rust-toolchain$" - ], - "matchStrings": [ - "(?\\d+\\.\\d+\\.\\d+)" - ], - "depNameTemplate": "Rust", - "packageNameTemplate": "rust-lang/rust", - "datasourceTemplate": "github-tags" - } - ] -} diff --git a/renovate.json5 b/renovate.json5 new file mode 100644 index 000000000..1a6fdcb67 --- /dev/null +++ b/renovate.json5 @@ -0,0 +1,78 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:recommended" + ], + "timezone": "Asia/Tokyo", + "separateMajorMinor": false, + "dependencyDashboardApproval": true, // 万が一`packageRules`の網羅性に穴ができた場合に備え + "packageRules": [ + { + "groupName": "major dependencies", + "matchUpdateTypes": [ + "major" + ], + "dependencyDashboardApproval": false + }, + { + "groupName": "major dependencies", + "matchUpdateTypes": [ + "minor" + ], + "matchCurrentVersion": "/^v?0\\./", + "dependencyDashboardApproval": false + }, + { + "groupName": "major dependencies", + "matchUpdateTypes": [ + "patch" + ], + "matchCurrentVersion": "/^v?0\\.0\\./", + "dependencyDashboardApproval": false + }, + { + "groupName": "non-major dependencies", + "matchUpdateTypes": [ + "minor" + ], + "matchCurrentVersion": "!/^v?0\\./", + "dependencyDashboardApproval": false + }, + { + "groupName": "non-major dependencies", + "matchUpdateTypes": [ + "patch" + ], + "matchCurrentVersion": "!/^v?0\\.0\\./", + "dependencyDashboardApproval": false + }, + { + "matchDatasources": [ + "github-runners" + ], + "matchPackageNames": [ + "windows", + "macos", + "ubuntu" + ], + "enabled": false + } + ], + "cargo": { + "rangeStrategy": "bump" + }, + "customManagers": [ + { + "customType": "regex", + "fileMatch": [ + "^rust-toolchain$" + ], + "matchStrings": [ + "(?\\d+\\.\\d+\\.\\d+)" + ], + "depNameTemplate": "Rust", + "packageNameTemplate": "rust-lang/rust", + "datasourceTemplate": "github-tags" + } + ] +} From ad28d7fac278de46ac3245cd3f6e45626f11b71d Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Sat, 28 Sep 2024 14:13:35 +0900 Subject: [PATCH 02/22] Add a comment https://github.com/VOICEVOX/voicevox_core/pull/839#discussion_r1778982147 Co-authored-by: Hiroshiba --- renovate.json5 | 1 + 1 file changed, 1 insertion(+) diff --git a/renovate.json5 b/renovate.json5 index 1a6fdcb67..cbfabf1ad 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -7,6 +7,7 @@ "separateMajorMinor": false, "dependencyDashboardApproval": true, // 万が一`packageRules`の網羅性に穴ができた場合に備え "packageRules": [ + // メジャーバージョンの更新 { "groupName": "major dependencies", "matchUpdateTypes": [ From 1656a415bbfba9fde9a1ff5c982be20c1e29553c Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Sat, 28 Sep 2024 14:14:15 +0900 Subject: [PATCH 03/22] [skip ci] Add a comment https://github.com/VOICEVOX/voicevox_core/pull/839#discussion_r1778982452 Co-authored-by: Hiroshiba --- renovate.json5 | 1 + 1 file changed, 1 insertion(+) diff --git a/renovate.json5 b/renovate.json5 index cbfabf1ad..42abb3ebf 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -31,6 +31,7 @@ "matchCurrentVersion": "/^v?0\\.0\\./", "dependencyDashboardApproval": false }, + // メジャーバージョン以外の更新 { "groupName": "non-major dependencies", "matchUpdateTypes": [ From 23adf4275178edb47e026b202b0bb58faf06ab43 Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Sat, 28 Sep 2024 14:27:48 +0900 Subject: [PATCH 04/22] Add a comment https://github.com/VOICEVOX/voicevox_core/pull/839#discussion_r1778982841 --- renovate.json5 | 1 + 1 file changed, 1 insertion(+) diff --git a/renovate.json5 b/renovate.json5 index 42abb3ebf..eee539c8c 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -48,6 +48,7 @@ "matchCurrentVersion": "!/^v?0\\.0\\./", "dependencyDashboardApproval": false }, + // GHAのrunnerに対しては無効化する { "matchDatasources": [ "github-runners" From 58472316ecfa1d0914849d82d7a5e3684fa4d1c2 Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Sat, 28 Sep 2024 14:30:00 +0900 Subject: [PATCH 05/22] =?UTF-8?q?"{major,non-major}=20dependencies"?= =?UTF-8?q?=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6=E8=AA=AC=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/VOICEVOX/voicevox_core/pull/839#discussion_r1778971161 --- renovate.json5 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/renovate.json5 b/renovate.json5 index eee539c8c..883228ff0 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -7,6 +7,13 @@ "separateMajorMinor": false, "dependencyDashboardApproval": true, // 万が一`packageRules`の網羅性に穴ができた場合に備え "packageRules": [ + // `separateMajorMinor`を無効化した上で次の二つのgroupにすべてをまとめる。 + // + // * "major dependencies" (`renovate/major-dependencies`) + // * "non-major dependencies" (`renovate/non-major-dependencies`) + // + // バージョン0.y.z (y≧1)のyとバージョン0.0.zのzの変更は"major dependencies"の方に含むようにする。 + // メジャーバージョンの更新 { "groupName": "major dependencies", @@ -31,6 +38,7 @@ "matchCurrentVersion": "/^v?0\\.0\\./", "dependencyDashboardApproval": false }, + // メジャーバージョン以外の更新 { "groupName": "non-major dependencies", @@ -48,6 +56,7 @@ "matchCurrentVersion": "!/^v?0\\.0\\./", "dependencyDashboardApproval": false }, + // GHAのrunnerに対しては無効化する { "matchDatasources": [ From 9d20232582733980a92dd7ee18809c5e640368f7 Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Sat, 28 Sep 2024 14:31:19 +0900 Subject: [PATCH 06/22] =?UTF-8?q?JSON5=E3=81=A8=E3=81=97=E3=81=A6=E3=83=95?= =?UTF-8?q?=E3=82=A9=E3=83=BC=E3=83=9E=E3=83=83=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/VOICEVOX/voicevox_core/pull/839#discussion_r1778965189 --- renovate.json5 | 100 ++++++++++++++++++++++++------------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/renovate.json5 b/renovate.json5 index 883228ff0..6fc45ac18 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -1,12 +1,12 @@ { - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "config:recommended" + $schema: "https://docs.renovatebot.com/renovate-schema.json", + extends: [ + "config:recommended", ], - "timezone": "Asia/Tokyo", - "separateMajorMinor": false, - "dependencyDashboardApproval": true, // 万が一`packageRules`の網羅性に穴ができた場合に備え - "packageRules": [ + timezone: "Asia/Tokyo", + separateMajorMinor: false, + dependencyDashboardApproval: true, // 万が一`packageRules`の網羅性に穴ができた場合に備え + packageRules: [ // `separateMajorMinor`を無効化した上で次の二つのgroupにすべてをまとめる。 // // * "major dependencies" (`renovate/major-dependencies`) @@ -16,75 +16,75 @@ // メジャーバージョンの更新 { - "groupName": "major dependencies", - "matchUpdateTypes": [ - "major" + groupName: "major dependencies", + matchUpdateTypes: [ + "major", ], - "dependencyDashboardApproval": false + dependencyDashboardApproval: false, }, { - "groupName": "major dependencies", - "matchUpdateTypes": [ - "minor" + groupName: "major dependencies", + matchUpdateTypes: [ + "minor", ], - "matchCurrentVersion": "/^v?0\\./", - "dependencyDashboardApproval": false + matchCurrentVersion: "/^v?0\\./", + dependencyDashboardApproval: false, }, { - "groupName": "major dependencies", - "matchUpdateTypes": [ - "patch" + groupName: "major dependencies", + matchUpdateTypes: [ + "patch", ], - "matchCurrentVersion": "/^v?0\\.0\\./", - "dependencyDashboardApproval": false + matchCurrentVersion: "/^v?0\\.0\\./", + dependencyDashboardApproval: false, }, // メジャーバージョン以外の更新 { - "groupName": "non-major dependencies", - "matchUpdateTypes": [ - "minor" + groupName: "non-major dependencies", + matchUpdateTypes: [ + "minor", ], - "matchCurrentVersion": "!/^v?0\\./", - "dependencyDashboardApproval": false + matchCurrentVersion: "!/^v?0\\./", + dependencyDashboardApproval: false, }, { - "groupName": "non-major dependencies", - "matchUpdateTypes": [ - "patch" + groupName: "non-major dependencies", + matchUpdateTypes: [ + "patch", ], - "matchCurrentVersion": "!/^v?0\\.0\\./", - "dependencyDashboardApproval": false + matchCurrentVersion: "!/^v?0\\.0\\./", + dependencyDashboardApproval: false, }, // GHAのrunnerに対しては無効化する { - "matchDatasources": [ - "github-runners" + matchDatasources: [ + "github-runners", ], - "matchPackageNames": [ + matchPackageNames: [ "windows", "macos", - "ubuntu" + "ubuntu", ], - "enabled": false - } + enabled: false, + }, ], - "cargo": { - "rangeStrategy": "bump" + cargo: { + rangeStrategy: "bump", }, - "customManagers": [ + customManagers: [ { - "customType": "regex", - "fileMatch": [ - "^rust-toolchain$" + customType: "regex", + fileMatch: [ + "^rust-toolchain$", ], - "matchStrings": [ - "(?\\d+\\.\\d+\\.\\d+)" + matchStrings: [ + "(?\\d+\\.\\d+\\.\\d+)", ], - "depNameTemplate": "Rust", - "packageNameTemplate": "rust-lang/rust", - "datasourceTemplate": "github-tags" - } - ] + depNameTemplate: "Rust", + packageNameTemplate: "rust-lang/rust", + datasourceTemplate: "github-tags", + }, + ], } From 927d714d040f65afcf0879d125deba3248ce76f8 Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Sat, 28 Sep 2024 14:41:10 +0900 Subject: [PATCH 07/22] =?UTF-8?q?Revert=20"JSON5=E3=81=A8=E3=81=97?= =?UTF-8?q?=E3=81=A6=E3=83=95=E3=82=A9=E3=83=BC=E3=83=9E=E3=83=83=E3=83=88?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9d20232582733980a92dd7ee18809c5e640368f7. --- renovate.json5 | 100 ++++++++++++++++++++++++------------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/renovate.json5 b/renovate.json5 index 6fc45ac18..883228ff0 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -1,12 +1,12 @@ { - $schema: "https://docs.renovatebot.com/renovate-schema.json", - extends: [ - "config:recommended", + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:recommended" ], - timezone: "Asia/Tokyo", - separateMajorMinor: false, - dependencyDashboardApproval: true, // 万が一`packageRules`の網羅性に穴ができた場合に備え - packageRules: [ + "timezone": "Asia/Tokyo", + "separateMajorMinor": false, + "dependencyDashboardApproval": true, // 万が一`packageRules`の網羅性に穴ができた場合に備え + "packageRules": [ // `separateMajorMinor`を無効化した上で次の二つのgroupにすべてをまとめる。 // // * "major dependencies" (`renovate/major-dependencies`) @@ -16,75 +16,75 @@ // メジャーバージョンの更新 { - groupName: "major dependencies", - matchUpdateTypes: [ - "major", + "groupName": "major dependencies", + "matchUpdateTypes": [ + "major" ], - dependencyDashboardApproval: false, + "dependencyDashboardApproval": false }, { - groupName: "major dependencies", - matchUpdateTypes: [ - "minor", + "groupName": "major dependencies", + "matchUpdateTypes": [ + "minor" ], - matchCurrentVersion: "/^v?0\\./", - dependencyDashboardApproval: false, + "matchCurrentVersion": "/^v?0\\./", + "dependencyDashboardApproval": false }, { - groupName: "major dependencies", - matchUpdateTypes: [ - "patch", + "groupName": "major dependencies", + "matchUpdateTypes": [ + "patch" ], - matchCurrentVersion: "/^v?0\\.0\\./", - dependencyDashboardApproval: false, + "matchCurrentVersion": "/^v?0\\.0\\./", + "dependencyDashboardApproval": false }, // メジャーバージョン以外の更新 { - groupName: "non-major dependencies", - matchUpdateTypes: [ - "minor", + "groupName": "non-major dependencies", + "matchUpdateTypes": [ + "minor" ], - matchCurrentVersion: "!/^v?0\\./", - dependencyDashboardApproval: false, + "matchCurrentVersion": "!/^v?0\\./", + "dependencyDashboardApproval": false }, { - groupName: "non-major dependencies", - matchUpdateTypes: [ - "patch", + "groupName": "non-major dependencies", + "matchUpdateTypes": [ + "patch" ], - matchCurrentVersion: "!/^v?0\\.0\\./", - dependencyDashboardApproval: false, + "matchCurrentVersion": "!/^v?0\\.0\\./", + "dependencyDashboardApproval": false }, // GHAのrunnerに対しては無効化する { - matchDatasources: [ - "github-runners", + "matchDatasources": [ + "github-runners" ], - matchPackageNames: [ + "matchPackageNames": [ "windows", "macos", - "ubuntu", + "ubuntu" ], - enabled: false, - }, + "enabled": false + } ], - cargo: { - rangeStrategy: "bump", + "cargo": { + "rangeStrategy": "bump" }, - customManagers: [ + "customManagers": [ { - customType: "regex", - fileMatch: [ - "^rust-toolchain$", + "customType": "regex", + "fileMatch": [ + "^rust-toolchain$" ], - matchStrings: [ - "(?\\d+\\.\\d+\\.\\d+)", + "matchStrings": [ + "(?\\d+\\.\\d+\\.\\d+)" ], - depNameTemplate: "Rust", - packageNameTemplate: "rust-lang/rust", - datasourceTemplate: "github-tags", - }, - ], + "depNameTemplate": "Rust", + "packageNameTemplate": "rust-lang/rust", + "datasourceTemplate": "github-tags" + } + ] } From a5ef979ab423d6a40dcf7cc2f4a33abe6730184b Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Sat, 28 Sep 2024 14:43:46 +0900 Subject: [PATCH 08/22] =?UTF-8?q?=E6=9C=AB=E5=B0=BE=E3=82=AB=E3=83=B3?= =?UTF-8?q?=E3=83=9E=E3=81=A0=E3=81=91=E5=85=A5=E3=82=8C=E3=81=A6=E3=81=BF?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- renovate.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json5 b/renovate.json5 index 883228ff0..22633cbd2 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -1,7 +1,7 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "config:recommended" + "config:recommended", ], "timezone": "Asia/Tokyo", "separateMajorMinor": false, From 432e572da88c5e736907f7ef7acb201cd7fdd64b Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Sat, 28 Sep 2024 14:48:30 +0900 Subject: [PATCH 09/22] =?UTF-8?q?=E6=9C=AB=E5=B0=BE=E3=82=AB=E3=83=B3?= =?UTF-8?q?=E3=83=9E=E3=81=A0=E3=81=91=E5=85=A5=E3=82=8C=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- renovate.json5 | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/renovate.json5 b/renovate.json5 index 22633cbd2..60883c7d8 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -18,73 +18,73 @@ { "groupName": "major dependencies", "matchUpdateTypes": [ - "major" + "major", ], - "dependencyDashboardApproval": false + "dependencyDashboardApproval": false, }, { "groupName": "major dependencies", "matchUpdateTypes": [ - "minor" + "minor", ], "matchCurrentVersion": "/^v?0\\./", - "dependencyDashboardApproval": false + "dependencyDashboardApproval": false, }, { "groupName": "major dependencies", "matchUpdateTypes": [ - "patch" + "patch", ], "matchCurrentVersion": "/^v?0\\.0\\./", - "dependencyDashboardApproval": false + "dependencyDashboardApproval": false, }, // メジャーバージョン以外の更新 { "groupName": "non-major dependencies", "matchUpdateTypes": [ - "minor" + "minor", ], "matchCurrentVersion": "!/^v?0\\./", - "dependencyDashboardApproval": false + "dependencyDashboardApproval": false, }, { "groupName": "non-major dependencies", "matchUpdateTypes": [ - "patch" + "patch", ], "matchCurrentVersion": "!/^v?0\\.0\\./", - "dependencyDashboardApproval": false + "dependencyDashboardApproval": false, }, // GHAのrunnerに対しては無効化する { "matchDatasources": [ - "github-runners" + "github-runners", ], "matchPackageNames": [ "windows", "macos", - "ubuntu" + "ubuntu", ], - "enabled": false - } + "enabled": false, + }, ], "cargo": { - "rangeStrategy": "bump" + "rangeStrategy": "bump", }, "customManagers": [ { "customType": "regex", "fileMatch": [ - "^rust-toolchain$" + "^rust-toolchain$", ], "matchStrings": [ - "(?\\d+\\.\\d+\\.\\d+)" + "(?\\d+\\.\\d+\\.\\d+)", ], "depNameTemplate": "Rust", "packageNameTemplate": "rust-lang/rust", - "datasourceTemplate": "github-tags" - } - ] + "datasourceTemplate": "github-tags", + }, + ], } From 322dcd7588f3d3421f15c5541aef0107eef5910f Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Sat, 28 Sep 2024 14:50:56 +0900 Subject: [PATCH 10/22] =?UTF-8?q?Revert=20"=E6=9C=AB=E5=B0=BE=E3=82=AB?= =?UTF-8?q?=E3=83=B3=E3=83=9E=E3=81=A0=E3=81=91=E5=85=A5=E3=82=8C=E3=82=8B?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 432e572da88c5e736907f7ef7acb201cd7fdd64b. --- renovate.json5 | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/renovate.json5 b/renovate.json5 index 60883c7d8..22633cbd2 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -18,73 +18,73 @@ { "groupName": "major dependencies", "matchUpdateTypes": [ - "major", + "major" ], - "dependencyDashboardApproval": false, + "dependencyDashboardApproval": false }, { "groupName": "major dependencies", "matchUpdateTypes": [ - "minor", + "minor" ], "matchCurrentVersion": "/^v?0\\./", - "dependencyDashboardApproval": false, + "dependencyDashboardApproval": false }, { "groupName": "major dependencies", "matchUpdateTypes": [ - "patch", + "patch" ], "matchCurrentVersion": "/^v?0\\.0\\./", - "dependencyDashboardApproval": false, + "dependencyDashboardApproval": false }, // メジャーバージョン以外の更新 { "groupName": "non-major dependencies", "matchUpdateTypes": [ - "minor", + "minor" ], "matchCurrentVersion": "!/^v?0\\./", - "dependencyDashboardApproval": false, + "dependencyDashboardApproval": false }, { "groupName": "non-major dependencies", "matchUpdateTypes": [ - "patch", + "patch" ], "matchCurrentVersion": "!/^v?0\\.0\\./", - "dependencyDashboardApproval": false, + "dependencyDashboardApproval": false }, // GHAのrunnerに対しては無効化する { "matchDatasources": [ - "github-runners", + "github-runners" ], "matchPackageNames": [ "windows", "macos", - "ubuntu", + "ubuntu" ], - "enabled": false, - }, + "enabled": false + } ], "cargo": { - "rangeStrategy": "bump", + "rangeStrategy": "bump" }, "customManagers": [ { "customType": "regex", "fileMatch": [ - "^rust-toolchain$", + "^rust-toolchain$" ], "matchStrings": [ - "(?\\d+\\.\\d+\\.\\d+)", + "(?\\d+\\.\\d+\\.\\d+)" ], "depNameTemplate": "Rust", "packageNameTemplate": "rust-lang/rust", - "datasourceTemplate": "github-tags", - }, - ], + "datasourceTemplate": "github-tags" + } + ] } From 392662bf9a7d683128fcdef372b261b243a5fd90 Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Sat, 28 Sep 2024 14:51:52 +0900 Subject: [PATCH 11/22] =?UTF-8?q?map=E3=81=AE=E6=9C=AB=E5=B0=BE=E3=81=AB?= =?UTF-8?q?=E3=82=AB=E3=83=B3=E3=83=9E=E3=82=92=E5=85=A5=E3=82=8C=E3=81=A6?= =?UTF-8?q?=E3=81=BF=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- renovate.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json5 b/renovate.json5 index 22633cbd2..32bfc3154 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -20,7 +20,7 @@ "matchUpdateTypes": [ "major" ], - "dependencyDashboardApproval": false + "dependencyDashboardApproval": false, }, { "groupName": "major dependencies", From cf101d938330b95a6168a76bf1371e5234aceb1b Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Sat, 28 Sep 2024 15:01:42 +0900 Subject: [PATCH 12/22] =?UTF-8?q?=E3=80=8Carray=E3=81=AE=E6=9C=AB=E5=B0=BE?= =?UTF-8?q?=E3=81=AEobject=E3=80=8D=E3=81=AB=E6=9C=AB=E5=B0=BE=E3=82=AB?= =?UTF-8?q?=E3=83=B3=E3=83=9E=E3=82=92=E5=85=A5=E3=82=8C=E3=81=A6=E3=81=BF?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- renovate.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json5 b/renovate.json5 index 32bfc3154..f908fd885 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -68,7 +68,7 @@ "ubuntu" ], "enabled": false - } + }, ], "cargo": { "rangeStrategy": "bump" From 10ba5537c3a6a7c3f8771f53552051b482cf7522 Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Sat, 28 Sep 2024 16:03:30 +0900 Subject: [PATCH 13/22] =?UTF-8?q?Docker=E7=89=88=E3=81=A7renovate.json5?= =?UTF-8?q?=E3=82=92=E8=AA=AD=E3=82=93=E3=81=A7=E3=81=BF=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/renovate.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/renovate.yml diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml new file mode 100644 index 000000000..782dbfb6f --- /dev/null +++ b/.github/workflows/renovate.yml @@ -0,0 +1,24 @@ +name: Renovate + +on: + push: + branches: + - chore-use-renovate-for-all-deps + workflow_dispatch: + +jobs: + renovate: + name: Renovate + runs-on: ubuntu-22.04 + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Renovate + uses: renovatebot/github-action@v40.2.10 + with: + configurationFile: renovate.json5 + env: + RENOVATE_REPOSITORIES: ${{ github.repository }} + LOG_LEVEL: debug From 701d7fd1a525eef5fe23adca23aa53e26c675b1c Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Sat, 28 Sep 2024 16:04:56 +0900 Subject: [PATCH 14/22] =?UTF-8?q?fixup!=20Docker=E7=89=88=E3=81=A7renovate?= =?UTF-8?q?.json5=E3=82=92=E8=AA=AD=E3=82=93=E3=81=A7=E3=81=BF=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/renovate.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml index 782dbfb6f..f4ffb5901 100644 --- a/.github/workflows/renovate.yml +++ b/.github/workflows/renovate.yml @@ -19,6 +19,7 @@ jobs: uses: renovatebot/github-action@v40.2.10 with: configurationFile: renovate.json5 + token: ${{ secrets.GITHUB_TOKEN }} env: RENOVATE_REPOSITORIES: ${{ github.repository }} LOG_LEVEL: debug From 01852355ef6f324441f1fb3239fca88fdf10d8a8 Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Sat, 28 Sep 2024 16:13:12 +0900 Subject: [PATCH 15/22] =?UTF-8?q?Revert=20"=E3=80=8Carray=E3=81=AE?= =?UTF-8?q?=E6=9C=AB=E5=B0=BE=E3=81=AEobject=E3=80=8D=E3=81=AB=E6=9C=AB?= =?UTF-8?q?=E5=B0=BE=E3=82=AB=E3=83=B3=E3=83=9E=E3=82=92=E5=85=A5=E3=82=8C?= =?UTF-8?q?=E3=81=A6=E3=81=BF=E3=82=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit cf101d938330b95a6168a76bf1371e5234aceb1b. --- renovate.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json5 b/renovate.json5 index f908fd885..32bfc3154 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -68,7 +68,7 @@ "ubuntu" ], "enabled": false - }, + } ], "cargo": { "rangeStrategy": "bump" From 7574139e8c303cfd625a5ac6e8c6beb4c8057a47 Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Sat, 28 Sep 2024 16:13:57 +0900 Subject: [PATCH 16/22] =?UTF-8?q?key=E3=81=AE`""`=E3=82=92=E5=A4=96?= =?UTF-8?q?=E3=81=97=E3=81=9F=E3=82=89=E3=81=A9=E3=81=86=E3=81=AA=E3=82=8B?= =?UTF-8?q?=E3=81=8B=EF=BC=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- renovate.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json5 b/renovate.json5 index 32bfc3154..ba15629a8 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -1,5 +1,5 @@ { - "$schema": "https://docs.renovatebot.com/renovate-schema.json", + $schema: "https://docs.renovatebot.com/renovate-schema.json", "extends": [ "config:recommended", ], From 13904f664fa74750cb802b30470f59379d4e7540 Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Sat, 28 Sep 2024 16:24:26 +0900 Subject: [PATCH 17/22] =?UTF-8?q?=E3=80=8Carray=E3=81=AE=E6=9C=AB=E5=B0=BE?= =?UTF-8?q?=E3=81=AEobject=E3=80=8D=E3=81=AB=E5=AF=BE=E3=81=99=E3=82=8B?= =?UTF-8?q?=E6=9C=AB=E5=B0=BE=E3=82=AB=E3=83=B3=E3=83=9E=E3=81=A0=E3=81=91?= =?UTF-8?q?=E9=81=BF=E3=81=91=E3=81=A6JSON5=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- renovate.json5 | 92 +++++++++++++++++++++++++------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/renovate.json5 b/renovate.json5 index ba15629a8..9d198c2d8 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -1,12 +1,12 @@ { $schema: "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ + extends: [ "config:recommended", ], - "timezone": "Asia/Tokyo", - "separateMajorMinor": false, - "dependencyDashboardApproval": true, // 万が一`packageRules`の網羅性に穴ができた場合に備え - "packageRules": [ + timezone: "Asia/Tokyo", + separateMajorMinor: false, + dependencyDashboardApproval: true, // 万が一`packageRules`の網羅性に穴ができた場合に備え + packageRules: [ // `separateMajorMinor`を無効化した上で次の二つのgroupにすべてをまとめる。 // // * "major dependencies" (`renovate/major-dependencies`) @@ -16,75 +16,75 @@ // メジャーバージョンの更新 { - "groupName": "major dependencies", - "matchUpdateTypes": [ - "major" + groupName: "major dependencies", + matchUpdateTypes: [ + "major", ], - "dependencyDashboardApproval": false, + dependencyDashboardApproval: false, }, { - "groupName": "major dependencies", - "matchUpdateTypes": [ - "minor" + groupName: "major dependencies", + matchUpdateTypes: [ + "minor", ], - "matchCurrentVersion": "/^v?0\\./", - "dependencyDashboardApproval": false + matchCurrentVersion: "/^v?0\\./", + dependencyDashboardApproval: false, }, { - "groupName": "major dependencies", - "matchUpdateTypes": [ - "patch" + groupName: "major dependencies", + matchUpdateTypes: [ + "patch", ], - "matchCurrentVersion": "/^v?0\\.0\\./", - "dependencyDashboardApproval": false + matchCurrentVersion: "/^v?0\\.0\\./", + dependencyDashboardApproval: false, }, // メジャーバージョン以外の更新 { - "groupName": "non-major dependencies", - "matchUpdateTypes": [ - "minor" + groupName: "non-major dependencies", + matchUpdateTypes: [ + "minor", ], - "matchCurrentVersion": "!/^v?0\\./", - "dependencyDashboardApproval": false + matchCurrentVersion: "!/^v?0\\./", + dependencyDashboardApproval: false, }, { - "groupName": "non-major dependencies", - "matchUpdateTypes": [ - "patch" + groupName: "non-major dependencies", + matchUpdateTypes: [ + "patch", ], - "matchCurrentVersion": "!/^v?0\\.0\\./", - "dependencyDashboardApproval": false + matchCurrentVersion: "!/^v?0\\.0\\./", + dependencyDashboardApproval: false, }, // GHAのrunnerに対しては無効化する { - "matchDatasources": [ - "github-runners" + matchDatasources: [ + "github-runners", ], - "matchPackageNames": [ + matchPackageNames: [ "windows", "macos", - "ubuntu" + "ubuntu", ], - "enabled": false + enabled: false, } ], - "cargo": { - "rangeStrategy": "bump" + cargo: { + rangeStrategy: "bump", }, - "customManagers": [ + customManagers: [ { - "customType": "regex", - "fileMatch": [ - "^rust-toolchain$" + customType: "regex", + fileMatch: [ + "^rust-toolchain$", ], - "matchStrings": [ - "(?\\d+\\.\\d+\\.\\d+)" + matchStrings: [ + "(?\\d+\\.\\d+\\.\\d+)", ], - "depNameTemplate": "Rust", - "packageNameTemplate": "rust-lang/rust", - "datasourceTemplate": "github-tags" + depNameTemplate: "Rust", + packageNameTemplate: "rust-lang/rust", + datasourceTemplate: "github-tags", } - ] + ], } From 3e47acf3f7cdff634a28dbd4e0bac2c09d8d9148 Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Sat, 28 Sep 2024 16:31:21 +0900 Subject: [PATCH 18/22] =?UTF-8?q?Revert=20"fixup!=20Docker=E7=89=88?= =?UTF-8?q?=E3=81=A7renovate.json5=E3=82=92=E8=AA=AD=E3=82=93=E3=81=A7?= =?UTF-8?q?=E3=81=BF=E3=82=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 701d7fd1a525eef5fe23adca23aa53e26c675b1c. --- .github/workflows/renovate.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml index f4ffb5901..782dbfb6f 100644 --- a/.github/workflows/renovate.yml +++ b/.github/workflows/renovate.yml @@ -19,7 +19,6 @@ jobs: uses: renovatebot/github-action@v40.2.10 with: configurationFile: renovate.json5 - token: ${{ secrets.GITHUB_TOKEN }} env: RENOVATE_REPOSITORIES: ${{ github.repository }} LOG_LEVEL: debug From 79521af5111e5b256f44eee09623728d1e707018 Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Sat, 28 Sep 2024 16:31:23 +0900 Subject: [PATCH 19/22] =?UTF-8?q?Revert=20"Docker=E7=89=88=E3=81=A7renovat?= =?UTF-8?q?e.json5=E3=82=92=E8=AA=AD=E3=82=93=E3=81=A7=E3=81=BF=E3=82=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 10ba5537c3a6a7c3f8771f53552051b482cf7522. --- .github/workflows/renovate.yml | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 .github/workflows/renovate.yml diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml deleted file mode 100644 index 782dbfb6f..000000000 --- a/.github/workflows/renovate.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Renovate - -on: - push: - branches: - - chore-use-renovate-for-all-deps - workflow_dispatch: - -jobs: - renovate: - name: Renovate - runs-on: ubuntu-22.04 - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Renovate - uses: renovatebot/github-action@v40.2.10 - with: - configurationFile: renovate.json5 - env: - RENOVATE_REPOSITORIES: ${{ github.repository }} - LOG_LEVEL: debug From 84c641ef131bfd7841b98df37f5f8356e1506a27 Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Sat, 28 Sep 2024 16:34:22 +0900 Subject: [PATCH 20/22] =?UTF-8?q?=E6=9C=AB=E5=B0=BE=E3=82=AB=E3=83=B3?= =?UTF-8?q?=E3=83=9E=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6=E3=81=AE=E6=B3=A8?= =?UTF-8?q?=E6=84=8F=E4=BA=8B=E9=A0=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/VOICEVOX/voicevox_core/pull/839#discussion_r1779435761 --- renovate.json5 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/renovate.json5 b/renovate.json5 index 9d198c2d8..95e6d57aa 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -1,3 +1,6 @@ +// どうやら**GitHub App版の**Renovateのみ、「arrayの最後の要素のobject」の後ろに末尾カンマを付けることが許容されないらしい。 +// https://github.com/VOICEVOX/voicevox_core/pull/839#discussion_r1779435761 + { $schema: "https://docs.renovatebot.com/renovate-schema.json", extends: [ From 6b8b92d5e8d51c9042fe26d1ea26e427731d635c Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Sat, 28 Sep 2024 19:18:44 +0900 Subject: [PATCH 21/22] =?UTF-8?q?array=E6=9C=AB=E5=B0=BE=E3=81=AEobject?= =?UTF-8?q?=E3=81=AE=E6=9C=AB=E5=B0=BE=E3=82=AB=E3=83=B3=E3=83=9E=E3=82=92?= =?UTF-8?q?=E5=BE=A9=E6=B4=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- renovate.json5 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/renovate.json5 b/renovate.json5 index 95e6d57aa..e0a1e5461 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -1,6 +1,5 @@ // どうやら**GitHub App版の**Renovateのみ、「arrayの最後の要素のobject」の後ろに末尾カンマを付けることが許容されないらしい。 // https://github.com/VOICEVOX/voicevox_core/pull/839#discussion_r1779435761 - { $schema: "https://docs.renovatebot.com/renovate-schema.json", extends: [ @@ -71,7 +70,7 @@ "ubuntu", ], enabled: false, - } + }, ], cargo: { rangeStrategy: "bump", @@ -88,6 +87,6 @@ depNameTemplate: "Rust", packageNameTemplate: "rust-lang/rust", datasourceTemplate: "github-tags", - } + }, ], } From 53e35e5eff6d6d7daff13786263eec42764b4885 Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Sat, 28 Sep 2024 19:20:16 +0900 Subject: [PATCH 22/22] =?UTF-8?q?Revert=20"=E6=9C=AB=E5=B0=BE=E3=82=AB?= =?UTF-8?q?=E3=83=B3=E3=83=9E=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6=E3=81=AE?= =?UTF-8?q?=E6=B3=A8=E6=84=8F=E4=BA=8B=E9=A0=85"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 84c641ef131bfd7841b98df37f5f8356e1506a27. --- renovate.json5 | 2 -- 1 file changed, 2 deletions(-) diff --git a/renovate.json5 b/renovate.json5 index e0a1e5461..6fc45ac18 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -1,5 +1,3 @@ -// どうやら**GitHub App版の**Renovateのみ、「arrayの最後の要素のobject」の後ろに末尾カンマを付けることが許容されないらしい。 -// https://github.com/VOICEVOX/voicevox_core/pull/839#discussion_r1779435761 { $schema: "https://docs.renovatebot.com/renovate-schema.json", extends: [