Merge branch 'all' into update_channels_list/2025_07

Takym · web-flow · commit 87c80881abf0 · 2025-07-12T23:56:54.000+09:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,6 +1,10 @@
 version: 2
 updates:
-  - package-ecosystem: "gitsubmodule"
+  - package-ecosystem: gitsubmodule
     directory: "/"
     schedule:
-      interval: "monthly"
+      interval: daily
+  - package-ecosystem: github-actions
+    directory: "/.github/workflows/"
+    schedule:
+      interval: daily
diff --git a/.github/workflows/MergeDependabotPR.yml b/.github/workflows/MergeDependabotPR.yml
@@ -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
+    runs-on: ubuntu-latest
+    steps:
+    - uses: KeisukeYamashita/auto-pull-request-merge@v1
+      with:
+          pullRequestNumber: ${{ github.event.pull_request.number }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: "dependencies,submodules"
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+_site/
+Gemfile.lock
diff --git a/Gemfile b/Gemfile
@@ -0,0 +1 @@
+gem "github-pages", group: :jekyll_plugins
diff --git a/_config.yml b/_config.yml
@@ -3,3 +3,6 @@ title: osdev.jp
 description: osdev-jpでは、OS開発に有用な情報を収集し公開しています
 logo: logo.png
 markdown: GFM
+plugins:
+  - jekyll-sitemap
+markdown: GFM
diff --git a/build.cmd b/build.cmd
@@ -0,0 +1,2 @@
+@echo off
+wsl bundle exec jekyll b
diff --git a/wiki b/wiki
@@ -1 +1 @@
-Subproject commit ae8cdc0edfab6f14122d568493ed92eba7199d9f
+Subproject commit c6378aab962da125f912d366dff118362cb2e3e4

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+gem "github-pages", group: :jekyll_plugins`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+@echo off`
	`2`	`+wsl bundle exec jekyll b`