Skip to content

Commit cc727f2

Browse files
TaiseiItoTaiseiIto
authored
Merge pull request #23 from Takym/master
最新のウィキを自動マージする GitHub Actions のワークフローを実装
2 parents 85acd8d + 01fa171 commit cc727f2

9 files changed

Lines changed: 60 additions & 3 deletions

File tree

‎.github/dependabot.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
version: 2
22
updates:
3-
- package-ecosystem: "gitsubmodule"
3+
- package-ecosystem: gitsubmodule
44
directory: "/"
55
schedule:
6-
interval: "monthly"
6+
interval: daily
7+
- package-ecosystem: github-actions
8+
directory: "/.github/workflows/"
9+
schedule:
10+
interval: daily

‎.github/workflows/UpdateWikiSubmodule.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
2+
name: "Update Wiki Submodule"
3+
4+
on:
5+
push:
6+
branches: [ master ]
7+
pull_request:
8+
types: [ opened, reopened ]
9+
branches: [ master ]
10+
schedule:
11+
- cron: "0 18 * * *" # 日本時間で毎日午前三時に自動実行
12+
workflow_dispatch:
13+
14+
jobs:
15+
merge:
16+
permissions:
17+
contents: write
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: actions/checkout@v6
21+
- name: "Switch to Master Branch"
22+
run: |
23+
git fetch origin
24+
git checkout master
25+
- name: "Load Submodule"
26+
run: git submodule update --init --recursive
27+
- name: "Update Wiki Directory"
28+
run: |
29+
cd wiki
30+
git fetch origin
31+
git pull origin master
32+
cd ..
33+
- name: "Configure git user information."
34+
run: |
35+
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
36+
git config --local user.name "github-actions[bot]"
37+
- name: "Commit & Push"
38+
run: |
39+
git add wiki
40+
git commit -m "[BOT] Update Wiki Submodule to the Current Latest version" || exit $(($? - 1))
41+
git push

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
_site/
2+
Gemfile.lock

‎Gemfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
gem "github-pages", group: :jekyll_plugins

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# osdev-jp
2+
13
## 第52回自作OSもくもく発表作業会のご案内！
24
8月2日（日）に自作OSもくもく発表作業会オンラインを開催します．
35
自分のOSを自慢したい人や，誰かのOSを見てみたい人，低レイヤに興味がある人はぜひ参加してください！
@@ -6,6 +8,7 @@
68
## リンク
79
- [Wiki](https://github.com/osdev-jp/osdev-jp.github.io/wiki) OS開発に役立つ情報が集まっています。GitHubアカウントがあれば編集できます。
810
- [ウェブページとして見る](https://osdev.jp/wiki/Home.html)
11+
- [![Update Wiki Submodule](https://github.com/osdev-jp/osdev-jp.github.io/actions/workflows/UpdateWikiSubmodule.yml/badge.svg)](https://github.com/osdev-jp/osdev-jp.github.io/actions/workflows/UpdateWikiSubmodule.yml) - <small>失敗している時は [Issues](https://github.com/osdev-jp/osdev-jp.github.io/issues) か [Discord の #運営の相談](https://discord.com/channels/1393134038142812195/1393150449519034452) へ連絡お願いします。</small>
912
- [GitHub](https://github.com/osdev-jp) サンプルコードなどが置いてあります。
1013
- [YouTube](https://www.youtube.com/channel/UCZi_C-xvC5qNcALfD_5JKIg) OS開発に関わる情報を動画で解説しています。
1114

‎_config.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@ theme: jekyll-theme-minimal
22
title: osdev.jp
33
description: osdev-jpでは、OS開発に有用な情報を収集し公開しています
44
logo: logo.png
5+
plugins:
6+
- jekyll-sitemap
57
markdown: GFM

‎build.cmd‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@echo off
2+
wsl bundle exec jekyll b

‎serve.cmd‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@echo off
2+
wsl bundle exec jekyll s

‎wiki‎

Submodule wiki updated from 86c4b14 to 2d474e1

0 commit comments

Comments
 (0)