From 85a392130b80e07a88786302e80d1a9e6849c25e Mon Sep 17 00:00:00 2001 From: Wcowin <1135801806@qq.com> Date: Tue, 15 Jul 2025 23:52:09 +0800 Subject: [PATCH] Update docs and resolve merge conflicts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolved merge conflict markers in service_config.json and page-authors.json. Updated a link in docs/link.md and cleaned up outdated workflow instructions and formatting in 利用Mkdocs部署静态网页至GitHubpages.md. --- .ai_cache/service_config.json | 4 ++ .../plugin/git-committers/page-authors.json | 6 +- docs/link.md | 2 +- 快速开始.md | 55 ++----------------- 4 files changed, 14 insertions(+), 53 deletions(-) diff --git a/.ai_cache/service_config.json b/.ai_cache/service_config.json index 48fbac7..c983853 100644 --- a/.ai_cache/service_config.json +++ b/.ai_cache/service_config.json @@ -6,5 +6,9 @@ "gemini" ], "summary_language": "zh", +<<<<<<< Updated upstream "check_time": "2025-07-15T23:27:54.141436" +======= + "check_time": "2025-07-12T17:33:43.408549" +>>>>>>> Stashed changes } \ No newline at end of file diff --git a/.cache/plugin/git-committers/page-authors.json b/.cache/plugin/git-committers/page-authors.json index 0abfe56..122bb9c 100644 --- a/.cache/plugin/git-committers/page-authors.json +++ b/.cache/plugin/git-committers/page-authors.json @@ -1 +1,5 @@ -{"cache_date": "2025-07-15", "page_authors": {}} \ No newline at end of file +<<<<<<< Updated upstream +{"cache_date": "2025-07-15", "page_authors": {}} +======= +{"cache_date": "2025-07-12", "page_authors": {}} +>>>>>>> Stashed changes diff --git a/docs/link.md b/docs/link.md index b85f117..2375fb5 100644 --- a/docs/link.md +++ b/docs/link.md @@ -48,7 +48,7 @@ t.parentNode.insertBefore(e,t)}})();
- MkDocs AI Summary + MkDocs AI Summary
AI驱动的摘要生成 diff --git a/快速开始.md b/快速开始.md index 0c2a2b1..fd5e636 100644 --- a/快速开始.md +++ b/快速开始.md @@ -1,16 +1,6 @@ ---- -title: 利用Mkdocs部署静态网页至GitHubpages -tags: - - Mkdocs ---- - -!!! info - Material for MkDocs官方网站: [Material for MkDocs](https://www.mkdocs.org/) - MkDocs中文文档: [MkDocs中文文档](https://hellowac.github.io/mkdocs-docs-zh/) ---- 推荐看下这个视频： -:fontawesome-brands-bilibili:{ style="color: #EE98A7" } -__[How to set up Material for MkDocs]__ by @Wcowin – :octicons-clock-24: + +__[How to set up Material for MkDocs]__ by @Wcowin – 10m – 用MKdocs构建一个博客网站. [How to set up Material for MkDocs]: https://space.bilibili.com/1407028951/lists/4566631?type=series @@ -61,42 +51,6 @@ mkdocs new mkdocs-site 执行下面的代码添加一个GitHub Workflow *** -???note "过时的PublishMySite.yml" - (执行下面的代码添加一个GitHub Workflow(**已经过时但是仍然能用，最新方法见下方ci.yml**) - - ``` - mkdir .github - cd .github - mkdir workflows - cd workflows - vim PublishMySite.yml - ``` - - 在PublishMySite.yml里面输入以下内容 - - ```yaml - name: publish site - on: # 在什么时候触发工作流 - push: # 在从本地main分支被push到GitHub仓库时 - branches: - - main - pull_request: # 在main分支合并别人提的pr时 - branches: - - main - jobs: # 工作流的具体内容 - deploy: - runs-on: ubuntu-latest # 创建一个新的云端虚拟机 使用最新Ubuntu系统 - steps: - - uses: actions/checkout@v2 # 先checkout到main分支 - - uses: actions/setup-python@v2 # 再安装Python3和相关环境 - with: - python-version: 3.x - - run: pip install mkdocs-material # 使用pip包管理工具安装mkdocs-material - - run: mkdocs gh-deploy --force # 使用mkdocs-material部署gh-pages分支 - - ``` - ) -*** ``` mkdir .github @@ -155,8 +109,7 @@ Wcowin.github.io └── mkdocs.yml ``` - -!!!重点来了 +**重点来了** Github仓库setings/Actions/General 勾选这两项 ![](https://s1.imagehub.cc/images/2024/02/02/02fd4e77eb52d4ce18c227f0e29b2c6d.png) @@ -177,7 +130,7 @@ theme: 详细mkdocs.yml配置见[Changing the colors - Material for MkDocs](https://squidfunk.github.io/mkdocs-material/setup/changing-the-colors/) -[下次](https://blog.csdn.net/m0_63203517/article/details/127444446?spm=1001.2014.3001.5502)我会具体谈谈这个问题 + *** 在下方终端运行可以在浏览器看到实时网站 ```