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.

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

Dependabot のプルリクエストを自動マージする GitHub Actions のワークフローを実装 #23

Open
wants to merge 44 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
f4f627a
Dependabot のプルリクエストを自動マージする仕組み
Takym Nov 26, 2023
4a46ccc
Update "Merge Dependabot PR"
Takym Nov 26, 2023
4414766
Bump wiki from `2c39a0b` to `4a65ba2`
dependabot[bot] Nov 26, 2023
6916e2d
Update "Merge Dependabot PR"
Takym Nov 26, 2023
1d06415
Merge pull request #3 from Takym/dependabot/submodules/wiki-4a65ba2
github-actions[bot] Nov 26, 2023
8b62c0b
Jekyll ビルド用のコマンドを追加
Takym Nov 26, 2023
8f0ab57
Merge branch 'master' of https://github.com/Takym/osdev-jp
Takym Nov 26, 2023
e916320
"Merge Dependabot PR" の権限を制限
Takym Nov 26, 2023
d89bfa7
Bump wiki from `4a65ba2` to `2b714d4`
dependabot[bot] Nov 26, 2023
1ff582a
Merge pull request #5 from Takym/dependabot/submodules/wiki-2b714d4
github-actions[bot] Nov 26, 2023
93a2d7a
"Merge Dependabot PR" のマージ対象のPRをサブモジュールに限定
Takym Nov 26, 2023
d6d04fa
Merge branch 'master' of https://github.com/Takym/osdev-jp
Takym Nov 26, 2023
3216792
Bump wiki from `2b714d4` to `22450b3`
dependabot[bot] Nov 26, 2023
0c5c94a
Merge pull request #6 from Takym/dependabot/submodules/wiki-22450b3
github-actions[bot] Nov 26, 2023
8e4c09d
Bump wiki from `22450b3` to `72b7e06`
dependabot[bot] Nov 27, 2023
8bcc538
Merge pull request #7 from Takym/dependabot/submodules/wiki-72b7e06
github-actions[bot] Nov 27, 2023
abde202
Bump wiki from `72b7e06` to `e5c54b1`
dependabot[bot] Jan 8, 2024
7c25ddb
Merge pull request #8 from Takym/dependabot/submodules/wiki-e5c54b1
github-actions[bot] Jan 8, 2024
773da39
Merge branch 'master' of https://github.com/osdev-jp/osdev-jp.github.…
Takym Jan 8, 2024
d14c4ea
Merge branch 'osdev-jp-master'
Takym Jan 8, 2024
9c88d95
Bump wiki from `e5c54b1` to `9ded830`
dependabot[bot] Feb 19, 2024
b5b54c3
Merge pull request #10 from Takym/dependabot/submodules/wiki-9ded830
github-actions[bot] Feb 19, 2024
6ea3200
Bump wiki from `9ded830` to `8d972b5`
dependabot[bot] Apr 2, 2024
e43b621
Merge pull request #11 from Takym/dependabot/submodules/wiki-8d972b5
github-actions[bot] Apr 2, 2024
67f4623
Bump wiki from `8d972b5` to `bbee3e2`
dependabot[bot] May 28, 2024
42692ac
Merge pull request #12 from Takym/dependabot/submodules/wiki-bbee3e2
github-actions[bot] May 28, 2024
061dd96
Bump wiki from `bbee3e2` to `727134c`
dependabot[bot] Jun 14, 2024
1736fe6
Merge pull request #13 from Takym/dependabot/submodules/wiki-727134c
github-actions[bot] Jun 14, 2024
a81a5ed
Bump wiki from `727134c` to `2b13bf1`
dependabot[bot] Jul 29, 2024
402bbf2
Merge pull request #14 from Takym/dependabot/submodules/wiki-2b13bf1
github-actions[bot] Jul 29, 2024
6ec63b7
Merge branch 'master' of https://github.com/osdev-jp/osdev-jp.github.io
Takym Aug 10, 2024
5aa6ee6
Merge branch 'master' of https://github.com/Takym/osdev-jp
Takym Aug 10, 2024
2aa31d7
Bump wiki from `2b13bf1` to `253fb53`
dependabot[bot] Aug 12, 2024
093e40b
Merge pull request #16 from Takym/dependabot/submodules/wiki-253fb53
github-actions[bot] Aug 12, 2024
d64f4d4
Bump wiki from `253fb53` to `0c8f50c`
dependabot[bot] Sep 2, 2024
ccc7b06
Merge pull request #17 from Takym/dependabot/submodules/wiki-0c8f50c
github-actions[bot] Sep 2, 2024
72e0f62
Bump wiki from `0c8f50c` to `c6378aa`
dependabot[bot] Sep 9, 2024
f3b1287
Merge pull request #18 from Takym/dependabot/submodules/wiki-c6378aa
github-actions[bot] Sep 9, 2024
929065a
Merge pull request #19 from osdev-jp/master
Takym Sep 27, 2024
5573b57
Bump wiki from `c6378aa` to `66fa44f`
dependabot[bot] Sep 29, 2024
8c1c08a
Merge pull request #20 from Takym/dependabot/submodules/wiki-66fa44f
github-actions[bot] Sep 29, 2024
86a4939
サイトマップ自動生成
Takym Oct 6, 2024
0eba283
Bump wiki from `66fa44f` to `3ada44c`
dependabot[bot] Oct 7, 2024
e6a6359
Merge pull request #21 from Takym/dependabot/submodules/wiki-3ada44c
github-actions[bot] Oct 7, 2024
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
8 changes: 6 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
version: 2
updates:
- package-ecosystem: "gitsubmodule"
- package-ecosystem: gitsubmodule
directory: "/"
schedule:
interval: "monthly"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

TODO: 実行頻度を見直す。

Copy link
Contributor Author

Choose a reason for hiding this comment

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

自動マージを行うのであれば、Dependabot を毎日動かしても問題ないでしょう。

interval: daily
- package-ecosystem: github-actions
directory: "/.github/workflows/"
schedule:
interval: daily
20 changes: 20 additions & 0 deletions .github/workflows/MergeDependabotPR.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@

name: "Merge Dependabot PR"

on:
pull_request:
types: [ opened, reopened ]
branches: [ master ]

jobs:
merge:
if: github.event.pull_request.user.login == 'dependabot[bot]'
permissions:
contents: write
Comment on lines +12 to +13
Copy link
Contributor Author

Choose a reason for hiding this comment

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

runs-on: ubuntu-latest
steps:
- uses: KeisukeYamashita/auto-pull-request-merge@v1
Copy link
Contributor Author

Choose a reason for hiding this comment

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

TODO: 安全性を確かめる。

Copy link
Contributor Author

Choose a reason for hiding this comment

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

https://github.com/KeisukeYamashita/auto-pull-request-merge からフォークして管理を行うという選択肢もあります。

with:
pullRequestNumber: ${{ github.event.pull_request.number }}
token: ${{ secrets.GITHUB_TOKEN }}
labels: "dependencies"
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
_site/
Gemfile.lock
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
gem "github-pages", group: :jekyll_plugins
2 changes: 2 additions & 0 deletions build.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
wsl bundle exec jekyll b
2 changes: 1 addition & 1 deletion wiki
Submodule wiki updated from 2c39a0 to 4a65ba