Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: 自動的にマージする設定を追加 #14

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

chore: 自動的にマージする設定を追加 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd1b49f
chore: 自動的にマージする設定を追加
sasaplus1 Feb 6, 2025
ea14585
chore: 自動マージを使用する
sasaplus1 Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions automerge-all.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
extends: [
':automergeAll'
],
lockFileMaintenance: {
automerge: true,
enabled: true
}
}
10 changes: 10 additions & 0 deletions automerge-minor.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
extends: [
':automergeMinor'
],
lockFileMaintenance: {
automerge: true,
enabled: true
}
}
7 changes: 2 additions & 5 deletions renovate.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
extends: [
'local>openameba/renovate-config:main.json5',
'local>openameba/renovate-config:npm.json5',
':automergeAll'
],
lockFileMaintenance: {
automerge: true
}
'local>openameba/renovate-config:automerge-all.json5'
Copy link

@sakito426 sakito426 Feb 7, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

q. main.json5にもlockFileMaintenance:enableの記載がありますが、動作的にはextends後勝ち(この場合は自動マージ)ですか？
≒利用者はextendsの順番を気にする必要がありますか？

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ふーむ、確かに、把握しておいた方がいいなと思いextendsした後の設定をrenovateコマンドから出力できるのではないかといろいろ調べてみていたんですが、手元では簡単に出力できなかったので実際にどうなるのかはもうちょっと調べてみます。

おそらくextendsを配列で指定する以上、後勝ちではあるはずで、ただオブジェクトのマージがdeepなのかshallowなのかは把握してないのでautomerge系にはlockFileMaintenanceについても書いた、という感じです。後に書くはず、という前提の基で。

Copy link
Member Author

@sasaplus1 sasaplus1 Feb 11, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How to get resolved config:

RENOVATE_TOKEN=xxx LOG_LEVEL=info npx renovate --force-cli=true --platform=github --dry-run=full --print-config=true --require-config=renovate.json5 openameba/renovate-config | tee log.txt

or

LOG_LEVEL=info npx renovate --token=xxx --force-cli=true --platform=github --dry-run=full --print-config=true --require-config=renovate.json5 openameba/renovate-config | tee log.txt

RENOVATE_TOKEN is your Personal Access Token, needs repo scope

If you want to check config file in locally, change --require-config value

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

☝️これリモートリポジトリのファイルしかチェックできんな

When an array or object configuration option is mergeable, it means that values inside it will be added to any existing object or array that existed with the same name.

via: https://docs.renovatebot.com/configuration-options/#configuration-options

とのことで

mergeable: true

via: https://docs.renovatebot.com/configuration-options/#lockfilemaintenance

なのでlockFileMaintenanceに関しては後勝ちで値はdeep-mergeだそうで配下の値も個別に後勝ちということになりますかね。

]
}