Skip to content

最新のウィキを自動マージする GitHub Actions のワークフローを実装#23

Open
Takym wants to merge 81 commits intoosdev-jp:masterfrom
Takym:master
Open

最新のウィキを自動マージする GitHub Actions のワークフローを実装#23
Takym wants to merge 81 commits intoosdev-jp:masterfrom
Takym:master

Conversation

@Takym
Copy link
Contributor

@Takym Takym commented Nov 26, 2023

TODO

@Takym Takym marked this pull request as draft November 26, 2023 10:36
dependabot bot and others added 12 commits November 26, 2023 10:51
Bumps [wiki](https://github.com/osdev-jp/osdev-jp.github.io.wiki) from `4a65ba2` to `2b714d4`.
- [Commits](https://github.com/osdev-jp/osdev-jp.github.io.wiki/compare/4a65ba21d9a836e5eeb2ae8a3cf1b18c77017c95...2b714d453c262445256b0137e199390beb4a00cd)

---
updated-dependencies:
- dependency-name: wiki
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [wiki](https://github.com/osdev-jp/osdev-jp.github.io.wiki) from `2b714d4` to `22450b3`.
- [Commits](https://github.com/osdev-jp/osdev-jp.github.io.wiki/compare/2b714d453c262445256b0137e199390beb4a00cd...22450b3654ced00199ac5d1a834cfa12ca094e7b)

---
updated-dependencies:
- dependency-name: wiki
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [wiki](https://github.com/osdev-jp/osdev-jp.github.io.wiki) from `22450b3` to `72b7e06`.
- [Commits](https://github.com/osdev-jp/osdev-jp.github.io.wiki/compare/22450b3654ced00199ac5d1a834cfa12ca094e7b...72b7e06322123639c063e16b9b84cf5f0f5f0319)

---
updated-dependencies:
- dependency-name: wiki
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [wiki](https://github.com/osdev-jp/osdev-jp.github.io.wiki) from `72b7e06` to `e5c54b1`.
- [Commits](https://github.com/osdev-jp/osdev-jp.github.io.wiki/compare/72b7e06322123639c063e16b9b84cf5f0f5f0319...e5c54b1f5bef13f60b6fce5328bddd8967b37f7f)

---
updated-dependencies:
- dependency-name: wiki
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
@Takym Takym marked this pull request as ready for review January 8, 2024 17:52
dependabot bot and others added 2 commits February 19, 2024 11:11
Bumps [wiki](https://github.com/osdev-jp/osdev-jp.github.io.wiki) from `e5c54b1` to `9ded830`.
- [Commits](https://github.com/osdev-jp/osdev-jp.github.io.wiki/compare/e5c54b1f5bef13f60b6fce5328bddd8967b37f7f...9ded830e6897e621a2be18ace5e9c215215a447f)

---
updated-dependencies:
- dependency-name: wiki
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
dependabot bot and others added 4 commits April 2, 2024 11:13
Bumps [wiki](https://github.com/osdev-jp/osdev-jp.github.io.wiki) from `9ded830` to `8d972b5`.
- [Commits](https://github.com/osdev-jp/osdev-jp.github.io.wiki/compare/9ded830e6897e621a2be18ace5e9c215215a447f...8d972b5e0c963eba8ab46774853c7cd7e83f7010)

---
updated-dependencies:
- dependency-name: wiki
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [wiki](https://github.com/osdev-jp/osdev-jp.github.io.wiki) from `8d972b5` to `bbee3e2`.
- [Commits](https://github.com/osdev-jp/osdev-jp.github.io.wiki/compare/8d972b5e0c963eba8ab46774853c7cd7e83f7010...bbee3e2cfb566454a7f4c9690747be78ae1927d6)

---
updated-dependencies:
- dependency-name: wiki
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
@Takym
Copy link
Contributor Author

Takym commented Jul 15, 2025

外部ツール(https://github.com/KeisukeYamashita/auto-pull-request-merge)を使わない方が安全と考え、ワークフローを定期的に実行する方式に変更しました。保険として Dependabot の設定も残してあります。

詳しくは https://osdev.jp/wiki/Takym-WikiToPages をご参照ください。

@Takym
Copy link
Contributor Author

Takym commented Jul 15, 2025

このプルリクエストはコミット数が多いので、コミット履歴を読み易くするという目的で、「Squash and merge」を選ぶ事を推奨します。「Merge pull request」の右側にある「▼」を押下するとメニューが表示される筈です。
image

@Takym Takym changed the title Dependabot のプルリクエストを自動マージする GitHub Actions のワークフローを実装 最新のウィキを自動マージする GitHub Actions のワークフローを実装 Jul 15, 2025
Takym and others added 16 commits July 16, 2025 01:48
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…b/workflows/actions/checkout-5

Bump actions/checkout from 4 to 5 in /.github/workflows
Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v5...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…b/workflows/actions/checkout-6

Bump actions/checkout from 5 to 6 in /.github/workflows
@Takym
Copy link
Contributor Author

Takym commented Mar 5, 2026

このコメントでも述べましたが、このプルリクエストは Squash した方が良いかと思います。80 コミットもありますが、殆どが自動マージの検証の為のコミットです。コミットを一つにまとめてしまっても、詳細な履歴はこのプルリクエストからいつでも確認できます。

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant