From 1dbaaec6a9f51af73e0a3afb1d46ffe8c5a0d222 Mon Sep 17 00:00:00 2001 From: Anduin Xue Date: Fri, 4 Mar 2022 23:49:00 +0800 Subject: [PATCH 01/16] rename actions. --- .github/workflows/build.yml | 2 +- .github/workflows/ci.yml | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3d8c92ef..8966c22e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Rebuild project +name: build on: push: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf2a413e..9c9bb23e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,10 +1,8 @@ -name: Continuous Integration +name: ci on: - push: - branches: [ master ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: markdown: From 0a0ffa83f35abf9f900b9be4eae9f82a4f77e8ff Mon Sep 17 00:00:00 2001 From: Anduin Xue Date: Fri, 4 Mar 2022 23:58:29 +0800 Subject: [PATCH 02/16] Change ci yml --- .github/workflows/{ci.yml => lint-check.yml} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename .github/workflows/{ci.yml => lint-check.yml} (89%) diff --git a/.github/workflows/ci.yml b/.github/workflows/lint-check.yml similarity index 89% rename from .github/workflows/ci.yml rename to .github/workflows/lint-check.yml index 9c9bb23e..368120c0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/lint-check.yml @@ -1,8 +1,8 @@ -name: ci +name: Lint Check on: pull_request: - branches: [ $default-branch ] + branches: [ master ] jobs: markdown: From b133fae81724869749dcd43dd526c5e8dca432b0 Mon Sep 17 00:00:00 2001 From: Anduin Xue Date: Sat, 5 Mar 2022 00:00:38 +0800 Subject: [PATCH 03/16] Rename again. --- .github/workflows/{lint-check.yml => lint-fix.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{lint-check.yml => lint-fix.yml} (95%) diff --git a/.github/workflows/lint-check.yml b/.github/workflows/lint-fix.yml similarity index 95% rename from .github/workflows/lint-check.yml rename to .github/workflows/lint-fix.yml index 368120c0..14e5a864 100644 --- a/.github/workflows/lint-check.yml +++ b/.github/workflows/lint-fix.yml @@ -1,4 +1,4 @@ -name: Lint Check +name: lint-fix on: pull_request: From faa4be73d15dd890cdfdd722da86643c679b6d44 Mon Sep 17 00:00:00 2001 From: Anduin Xue Date: Sat, 5 Mar 2022 00:03:12 +0800 Subject: [PATCH 04/16] Rename back. --- .github/workflows/{lint-fix.yml => ci.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{lint-fix.yml => ci.yml} (93%) diff --git a/.github/workflows/lint-fix.yml b/.github/workflows/ci.yml similarity index 93% rename from .github/workflows/lint-fix.yml rename to .github/workflows/ci.yml index 14e5a864..a6059eea 100644 --- a/.github/workflows/lint-fix.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: lint-fix +name: Continuous Integration on: pull_request: From 0b9669c34c67b791e998be6ba8bb92ef6776cd9e Mon Sep 17 00:00:00 2001 From: Anduin Xue Date: Sat, 5 Mar 2022 00:06:56 +0800 Subject: [PATCH 05/16] Rename ci job to markdown-lint. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a6059eea..be60ed89 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,7 @@ on: branches: [ master ] jobs: - markdown: + markdown-lint: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 From 5964e529063fbec2cb2bcf59c65eb5445549cfb2 Mon Sep 17 00:00:00 2001 From: Anduin Xue Date: Sat, 5 Mar 2022 00:07:37 +0800 Subject: [PATCH 06/16] Test PR 2 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 99709d49..762b7ed5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 程序员做饭指南 +# 程序员做饭指南2 [![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/Anduin2017/HowToCook/Continuous%20Integration/master)](https://github.com/Anduin2017/HowToCook/actions/workflows/ci.yml) [![License](https://img.shields.io/github/license/Anduin2017/HowToCook)](./LICENSE) From b7efb4a7ca7696b1773fa4534d238a1bafce3efb Mon Sep 17 00:00:00 2001 From: Anduin Xue Date: Sat, 5 Mar 2022 00:07:52 +0800 Subject: [PATCH 07/16] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 762b7ed5..99709d49 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 程序员做饭指南2 +# 程序员做饭指南 [![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/Anduin2017/HowToCook/Continuous%20Integration/master)](https://github.com/Anduin2017/HowToCook/actions/workflows/ci.yml) [![License](https://img.shields.io/github/license/Anduin2017/HowToCook)](./LICENSE) From e18308a73539451f1c4a556144683cdcf17be604 Mon Sep 17 00:00:00 2001 From: Anduin Xue Date: Sat, 5 Mar 2022 00:19:54 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E5=B0=86=E6=B0=B4=E4=BA=A7=E4=BD=9C?= =?UTF-8?q?=E4=B8=BA=E4=B8=80=E4=B8=AA=E7=8B=AC=E7=AB=8B=E7=9A=84=E5=88=86?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/readme-generate.js | 5 +++++ dishes/{meat_dish => aquatic}/咖喱炒蟹.md | 0 dishes/{meat_dish => aquatic}/微波葱姜黑鳕鱼.md | 0 dishes/{meat_dish => aquatic}/混合烤鱼/烤鱼.jpg | 0 dishes/{meat_dish => aquatic}/混合烤鱼/烤鱼.md | 0 dishes/{meat_dish => aquatic}/清蒸生蚝.md | 0 dishes/{meat_dish => aquatic}/清蒸鲈鱼/摆盘.jpg | 0 dishes/{meat_dish => aquatic}/清蒸鲈鱼/改刀.jpg | 0 dishes/{meat_dish => aquatic}/清蒸鲈鱼/清蒸鲈鱼.jpg | 0 dishes/{meat_dish => aquatic}/清蒸鲈鱼/清蒸鲈鱼.md | 0 dishes/{meat_dish => aquatic}/白灼虾/白灼虾.md | 0 dishes/{meat_dish => aquatic}/白灼虾/白灼虾.webp | 0 dishes/{meat_dish => aquatic}/糖醋鲤鱼/成品.jpg | 0 dishes/{meat_dish => aquatic}/糖醋鲤鱼/糖醋鲤鱼.md | 0 dishes/{meat_dish => aquatic}/糖醋鲤鱼/腌制.jpg | 0 dishes/{meat_dish => aquatic}/红烧鱼头.md | 0 dishes/{meat_dish => aquatic}/红烧鲤鱼.md | 0 dishes/{meat_dish => aquatic}/鳊鱼炖豆腐/鳊鱼炖豆腐.jpg | 0 dishes/{meat_dish => aquatic}/鳊鱼炖豆腐/鳊鱼炖豆腐.md | 0 dishes/{meat_dish => aquatic}/黄油煎虾/黄油煎虾.jpg | 0 dishes/{meat_dish => aquatic}/黄油煎虾/黄油煎虾.md | 0 dishes/meat_dish/洋葱炒猪肉.md | 5 +---- 22 files changed, 6 insertions(+), 4 deletions(-) rename dishes/{meat_dish => aquatic}/咖喱炒蟹.md (100%) rename dishes/{meat_dish => aquatic}/微波葱姜黑鳕鱼.md (100%) rename dishes/{meat_dish => aquatic}/混合烤鱼/烤鱼.jpg (100%) rename dishes/{meat_dish => aquatic}/混合烤鱼/烤鱼.md (100%) rename dishes/{meat_dish => aquatic}/清蒸生蚝.md (100%) rename dishes/{meat_dish => aquatic}/清蒸鲈鱼/摆盘.jpg (100%) rename dishes/{meat_dish => aquatic}/清蒸鲈鱼/改刀.jpg (100%) rename dishes/{meat_dish => aquatic}/清蒸鲈鱼/清蒸鲈鱼.jpg (100%) rename dishes/{meat_dish => aquatic}/清蒸鲈鱼/清蒸鲈鱼.md (100%) rename dishes/{meat_dish => aquatic}/白灼虾/白灼虾.md (100%) rename dishes/{meat_dish => aquatic}/白灼虾/白灼虾.webp (100%) rename dishes/{meat_dish => aquatic}/糖醋鲤鱼/成品.jpg (100%) rename dishes/{meat_dish => aquatic}/糖醋鲤鱼/糖醋鲤鱼.md (100%) rename dishes/{meat_dish => aquatic}/糖醋鲤鱼/腌制.jpg (100%) rename dishes/{meat_dish => aquatic}/红烧鱼头.md (100%) rename dishes/{meat_dish => aquatic}/红烧鲤鱼.md (100%) rename dishes/{meat_dish => aquatic}/鳊鱼炖豆腐/鳊鱼炖豆腐.jpg (100%) rename dishes/{meat_dish => aquatic}/鳊鱼炖豆腐/鳊鱼炖豆腐.md (100%) rename dishes/{meat_dish => aquatic}/黄油煎虾/黄油煎虾.jpg (100%) rename dishes/{meat_dish => aquatic}/黄油煎虾/黄油煎虾.md (100%) diff --git a/.github/readme-generate.js b/.github/readme-generate.js index 2e7466ba..2c006856 100644 --- a/.github/readme-generate.js +++ b/.github/readme-generate.js @@ -17,6 +17,11 @@ const categories = { readme: '', mkdocs: '', }, + aquatic: { + title: '水产', + readme: '', + mkdocs: '', + }, breakfast: { title: '早餐', readme: '', diff --git a/dishes/meat_dish/咖喱炒蟹.md b/dishes/aquatic/咖喱炒蟹.md similarity index 100% rename from dishes/meat_dish/咖喱炒蟹.md rename to dishes/aquatic/咖喱炒蟹.md diff --git a/dishes/meat_dish/微波葱姜黑鳕鱼.md b/dishes/aquatic/微波葱姜黑鳕鱼.md similarity index 100% rename from dishes/meat_dish/微波葱姜黑鳕鱼.md rename to dishes/aquatic/微波葱姜黑鳕鱼.md diff --git a/dishes/meat_dish/混合烤鱼/烤鱼.jpg b/dishes/aquatic/混合烤鱼/烤鱼.jpg similarity index 100% rename from dishes/meat_dish/混合烤鱼/烤鱼.jpg rename to dishes/aquatic/混合烤鱼/烤鱼.jpg diff --git a/dishes/meat_dish/混合烤鱼/烤鱼.md b/dishes/aquatic/混合烤鱼/烤鱼.md similarity index 100% rename from dishes/meat_dish/混合烤鱼/烤鱼.md rename to dishes/aquatic/混合烤鱼/烤鱼.md diff --git a/dishes/meat_dish/清蒸生蚝.md b/dishes/aquatic/清蒸生蚝.md similarity index 100% rename from dishes/meat_dish/清蒸生蚝.md rename to dishes/aquatic/清蒸生蚝.md diff --git a/dishes/meat_dish/清蒸鲈鱼/摆盘.jpg b/dishes/aquatic/清蒸鲈鱼/摆盘.jpg similarity index 100% rename from dishes/meat_dish/清蒸鲈鱼/摆盘.jpg rename to dishes/aquatic/清蒸鲈鱼/摆盘.jpg diff --git a/dishes/meat_dish/清蒸鲈鱼/改刀.jpg b/dishes/aquatic/清蒸鲈鱼/改刀.jpg similarity index 100% rename from dishes/meat_dish/清蒸鲈鱼/改刀.jpg rename to dishes/aquatic/清蒸鲈鱼/改刀.jpg diff --git a/dishes/meat_dish/清蒸鲈鱼/清蒸鲈鱼.jpg b/dishes/aquatic/清蒸鲈鱼/清蒸鲈鱼.jpg similarity index 100% rename from dishes/meat_dish/清蒸鲈鱼/清蒸鲈鱼.jpg rename to dishes/aquatic/清蒸鲈鱼/清蒸鲈鱼.jpg diff --git a/dishes/meat_dish/清蒸鲈鱼/清蒸鲈鱼.md b/dishes/aquatic/清蒸鲈鱼/清蒸鲈鱼.md similarity index 100% rename from dishes/meat_dish/清蒸鲈鱼/清蒸鲈鱼.md rename to dishes/aquatic/清蒸鲈鱼/清蒸鲈鱼.md diff --git a/dishes/meat_dish/白灼虾/白灼虾.md b/dishes/aquatic/白灼虾/白灼虾.md similarity index 100% rename from dishes/meat_dish/白灼虾/白灼虾.md rename to dishes/aquatic/白灼虾/白灼虾.md diff --git a/dishes/meat_dish/白灼虾/白灼虾.webp b/dishes/aquatic/白灼虾/白灼虾.webp similarity index 100% rename from dishes/meat_dish/白灼虾/白灼虾.webp rename to dishes/aquatic/白灼虾/白灼虾.webp diff --git a/dishes/meat_dish/糖醋鲤鱼/成品.jpg b/dishes/aquatic/糖醋鲤鱼/成品.jpg similarity index 100% rename from dishes/meat_dish/糖醋鲤鱼/成品.jpg rename to dishes/aquatic/糖醋鲤鱼/成品.jpg diff --git a/dishes/meat_dish/糖醋鲤鱼/糖醋鲤鱼.md b/dishes/aquatic/糖醋鲤鱼/糖醋鲤鱼.md similarity index 100% rename from dishes/meat_dish/糖醋鲤鱼/糖醋鲤鱼.md rename to dishes/aquatic/糖醋鲤鱼/糖醋鲤鱼.md diff --git a/dishes/meat_dish/糖醋鲤鱼/腌制.jpg b/dishes/aquatic/糖醋鲤鱼/腌制.jpg similarity index 100% rename from dishes/meat_dish/糖醋鲤鱼/腌制.jpg rename to dishes/aquatic/糖醋鲤鱼/腌制.jpg diff --git a/dishes/meat_dish/红烧鱼头.md b/dishes/aquatic/红烧鱼头.md similarity index 100% rename from dishes/meat_dish/红烧鱼头.md rename to dishes/aquatic/红烧鱼头.md diff --git a/dishes/meat_dish/红烧鲤鱼.md b/dishes/aquatic/红烧鲤鱼.md similarity index 100% rename from dishes/meat_dish/红烧鲤鱼.md rename to dishes/aquatic/红烧鲤鱼.md diff --git a/dishes/meat_dish/鳊鱼炖豆腐/鳊鱼炖豆腐.jpg b/dishes/aquatic/鳊鱼炖豆腐/鳊鱼炖豆腐.jpg similarity index 100% rename from dishes/meat_dish/鳊鱼炖豆腐/鳊鱼炖豆腐.jpg rename to dishes/aquatic/鳊鱼炖豆腐/鳊鱼炖豆腐.jpg diff --git a/dishes/meat_dish/鳊鱼炖豆腐/鳊鱼炖豆腐.md b/dishes/aquatic/鳊鱼炖豆腐/鳊鱼炖豆腐.md similarity index 100% rename from dishes/meat_dish/鳊鱼炖豆腐/鳊鱼炖豆腐.md rename to dishes/aquatic/鳊鱼炖豆腐/鳊鱼炖豆腐.md diff --git a/dishes/meat_dish/黄油煎虾/黄油煎虾.jpg b/dishes/aquatic/黄油煎虾/黄油煎虾.jpg similarity index 100% rename from dishes/meat_dish/黄油煎虾/黄油煎虾.jpg rename to dishes/aquatic/黄油煎虾/黄油煎虾.jpg diff --git a/dishes/meat_dish/黄油煎虾/黄油煎虾.md b/dishes/aquatic/黄油煎虾/黄油煎虾.md similarity index 100% rename from dishes/meat_dish/黄油煎虾/黄油煎虾.md rename to dishes/aquatic/黄油煎虾/黄油煎虾.md diff --git a/dishes/meat_dish/洋葱炒猪肉.md b/dishes/meat_dish/洋葱炒猪肉.md index ba162190..7690e955 100644 --- a/dishes/meat_dish/洋葱炒猪肉.md +++ b/dishes/meat_dish/洋葱炒猪肉.md @@ -1,9 +1,6 @@ # 洋葱炒猪肉的做法 -咸中带甜 -简单上手 -一不小心可能让你多吃一碗饭 -一般只需 15 分钟即可完成 +咸中带甜，简单上手，一不小心可能让你多吃一碗饭。一般只需 15 分钟即可完成。 ## 必备原料和工具 From 3626b6f403786e252df970e26ad2b9999f063785 Mon Sep 17 00:00:00 2001 From: Anduin Xue Date: Sat, 5 Mar 2022 00:29:01 +0800 Subject: [PATCH 09/16] Checkout with PAT. --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8966c22e..f0ac1816 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,6 +11,8 @@ jobs: steps: # Preparation. - uses: actions/checkout@v2 + with: + token: ${{ secrets.PAT }} - uses: actions/setup-node@v2 with: node-version: '16' From 6c6211ca3bdf769cdf153a9a9fc4614821cf085f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 4 Mar 2022 16:30:03 +0000 Subject: [PATCH 10/16] [ci skip] Automatic file changes/fix --- README.md | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 99709d49..20b63ff0 100644 --- a/README.md +++ b/README.md @@ -58,38 +58,27 @@ ### 荤菜 - [白菜猪肉炖粉条](./dishes/meat_dish/白菜猪肉炖粉条.md) -- [白灼虾](./dishes/meat_dish/白灼虾/白灼虾.md) -- [鳊鱼炖豆腐](./dishes/meat_dish/鳊鱼炖豆腐/鳊鱼炖豆腐.md) - [宫保鸡丁](./dishes/meat_dish/宫保鸡丁/宫保鸡丁.md) - [咕噜肉](./dishes/meat_dish/咕噜肉.md) -- [红烧鲤鱼](./dishes/meat_dish/红烧鲤鱼.md) - [简易红烧肉](./dishes/meat_dish/红烧肉/简易红烧肉.md) - [南派红烧肉](./dishes/meat_dish/红烧肉/南派红烧肉.md) -- [红烧鱼头](./dishes/meat_dish/红烧鱼头.md) - [红烧猪蹄](./dishes/meat_dish/红烧猪蹄/红烧猪蹄.md) - [黄瓜炒肉](./dishes/meat_dish/黄瓜炒肉.md) -- [黄油煎虾](./dishes/meat_dish/黄油煎虾/黄油煎虾.md) - [回锅肉](./dishes/meat_dish/回锅肉.md) -- [烤鱼](./dishes/meat_dish/混合烤鱼/烤鱼.md) - [茄子炖土豆](./dishes/meat_dish/茄子炖土豆.md) - [尖椒炒牛肉](./dishes/meat_dish/尖椒炒牛肉.md) - [姜炒鸡](./dishes/meat_dish/姜炒鸡/姜炒鸡.md) - [酱牛肉](./dishes/meat_dish/酱牛肉/酱牛肉.md) -- [咖喱炒蟹](./dishes/meat_dish/咖喱炒蟹.md) - [可乐鸡翅](./dishes/meat_dish/可乐鸡翅.md) - [口水鸡](./dishes/meat_dish/口水鸡/口水鸡.md) - [辣椒炒肉](./dishes/meat_dish/辣椒炒肉.md) - [老式锅包肉](./dishes/meat_dish/老式锅包肉/老式锅包肉.md) - [凉拌鸡丝](./dishes/meat_dish/凉拌鸡丝/凉拌鸡丝.md) - [萝卜炖羊排](./dishes/meat_dish/萝卜炖羊排.md) -- [清蒸鲈鱼](./dishes/meat_dish/清蒸鲈鱼/清蒸鲈鱼.md) -- [清蒸生蚝](./dishes/meat_dish/清蒸生蚝.md) - [水煮牛肉](./dishes/meat_dish/水煮牛肉/水煮牛肉.md) - [水煮肉片](./dishes/meat_dish/水煮肉片.md) - [糖醋里脊](./dishes/meat_dish/糖醋里脊.md) -- [糖醋鲤鱼](./dishes/meat_dish/糖醋鲤鱼/糖醋鲤鱼.md) - [土豆炖排骨](./dishes/meat_dish/土豆炖排骨/土豆炖排骨.md) -- [微波葱姜黑鳕鱼](./dishes/meat_dish/微波葱姜黑鳕鱼.md) - [西红柿牛腩](./dishes/meat_dish/西红柿牛腩/西红柿牛腩.md) - [西红柿土豆炖牛肉](./dishes/meat_dish/西红柿土豆炖牛肉/西红柿土豆炖牛肉.md) - [香干芹菜炒肉](./dishes/meat_dish/香干芹菜炒肉/香干芹菜炒肉.md) @@ -104,6 +93,20 @@ - [鱼香肉丝](./dishes/meat_dish/鱼香肉丝.md) - [孜然牛肉](./dishes/meat_dish/孜然牛肉.md) +### 水产 + +- [白灼虾](./dishes/aquatic/白灼虾/白灼虾.md) +- [鳊鱼炖豆腐](./dishes/aquatic/鳊鱼炖豆腐/鳊鱼炖豆腐.md) +- [红烧鲤鱼](./dishes/aquatic/红烧鲤鱼.md) +- [红烧鱼头](./dishes/aquatic/红烧鱼头.md) +- [黄油煎虾](./dishes/aquatic/黄油煎虾/黄油煎虾.md) +- [烤鱼](./dishes/aquatic/混合烤鱼/烤鱼.md) +- [咖喱炒蟹](./dishes/aquatic/咖喱炒蟹.md) +- [清蒸鲈鱼](./dishes/aquatic/清蒸鲈鱼/清蒸鲈鱼.md) +- [清蒸生蚝](./dishes/aquatic/清蒸生蚝.md) +- [糖醋鲤鱼](./dishes/aquatic/糖醋鲤鱼/糖醋鲤鱼.md) +- [微波葱姜黑鳕鱼](./dishes/aquatic/微波葱姜黑鳕鱼.md) + ### 早餐 - [茶叶蛋](./dishes/breakfast/茶叶蛋.md) From 8773dd6f671dc79b94fec73268ce9ad5cbe7b82d Mon Sep 17 00:00:00 2001 From: Anduin Xue Date: Sat, 5 Mar 2022 00:31:00 +0800 Subject: [PATCH 11/16] Display deploy as badge. --- .github/readme-generate.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/readme-generate.js b/.github/readme-generate.js index 2c006856..741e553f 100644 --- a/.github/readme-generate.js +++ b/.github/readme-generate.js @@ -61,7 +61,7 @@ const categories = { let README_TEMPLATE = `# 程序员做饭指南 -[![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/Anduin2017/HowToCook/Continuous%20Integration/master)](https://github.com/Anduin2017/HowToCook/actions/workflows/ci.yml) +[![build](https://github.com/Anduin2017/HowToCook/actions/workflows/build.yml/badge.svg)](https://github.com/Anduin2017/HowToCook/actions/workflows/build.yml) [![License](https://img.shields.io/github/license/Anduin2017/HowToCook)](./LICENSE) [![GitHub contributors](https://img.shields.io/github/contributors/Anduin2017/HowToCook)](https://github.com/Anduin2017/HowToCook/graphs/contributors) From 1d6a55a333702a85ddcf0f964a6af19b6fc3084b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 4 Mar 2022 16:31:56 +0000 Subject: [PATCH 12/16] [ci skip] Automatic file changes/fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 20b63ff0..c5b731d9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # 程序员做饭指南 -[![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/Anduin2017/HowToCook/Continuous%20Integration/master)](https://github.com/Anduin2017/HowToCook/actions/workflows/ci.yml) +[![build](https://github.com/Anduin2017/HowToCook/actions/workflows/build.yml/badge.svg)](https://github.com/Anduin2017/HowToCook/actions/workflows/build.yml) [![License](https://img.shields.io/github/license/Anduin2017/HowToCook)](./LICENSE) [![GitHub contributors](https://img.shields.io/github/contributors/Anduin2017/HowToCook)](https://github.com/Anduin2017/HowToCook/graphs/contributors) From 05599cd0d71a867385e41c9b1a8393dd6229ebc5 Mon Sep 17 00:00:00 2001 From: Anduin Xue Date: Sat, 5 Mar 2022 00:36:13 +0800 Subject: [PATCH 13/16] Also commit the generated mk file. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f0ac1816..3a396a1c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: with: commit_message: '[ci skip] Automatic file changes/fix' branch: 'master' - file_pattern: ':/*.md' + file_pattern: ':/*.*' commit_user_name: github-actions[bot] commit_user_email: github-actions[bot]@users.noreply.github.com commit_author: github-actions[bot] From 67d8c008597eb9c8f08bedbacd8352f2c5a9442d Mon Sep 17 00:00:00 2001 From: Anduin Xue Date: Sat, 5 Mar 2022 00:39:43 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E9=94=99=E8=AF=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dishes/staple/日式咖喱饭/日式咖喱饭.md | 2 +- dishes/staple/蛋炒饭.md | 2 +- dishes/staple/韩式拌饭/韩式拌饭.md | 2 +- tips/learn/微波炉.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dishes/staple/日式咖喱饭/日式咖喱饭.md b/dishes/staple/日式咖喱饭/日式咖喱饭.md index 9b442d6e..6e4abd15 100644 --- a/dishes/staple/日式咖喱饭/日式咖喱饭.md +++ b/dishes/staple/日式咖喱饭/日式咖喱饭.md @@ -53,7 +53,7 @@ ### 3.冷藏后加热 -冷藏的咖喱每次取出需要吃的份量，加热后盖在[米饭](../米饭/米饭.md)上。 +冷藏的咖喱每次取出需要吃的份量，加热后盖在[米饭](../米饭/电饭煲蒸米饭.md)上。 - 微波炉：单人份高火 2-3 分钟 - 锅：需额外加 50ml 水，加热时保持搅拌 diff --git a/dishes/staple/蛋炒饭.md b/dishes/staple/蛋炒饭.md index ef7cdb7e..5ab86203 100644 --- a/dishes/staple/蛋炒饭.md +++ b/dishes/staple/蛋炒饭.md @@ -14,7 +14,7 @@ * 香葱 * 灯影牛肉丝（备选） -准备时，米饭可以参考[米饭的做法](./米饭/米饭.md)。 +准备时，米饭可以参考[米饭的做法](./米饭/电饭煲蒸米饭.md)。 ## 计算 diff --git a/dishes/staple/韩式拌饭/韩式拌饭.md b/dishes/staple/韩式拌饭/韩式拌饭.md index 0266411c..144ec776 100644 --- a/dishes/staple/韩式拌饭/韩式拌饭.md +++ b/dishes/staple/韩式拌饭/韩式拌饭.md @@ -38,7 +38,7 @@ - 蔬菜清洗 切丝 放锅中翻炒 食材变软 便可称出 - 煮水 等沸腾时 焯牛肉卷 只需煮熟 大概三分钟即可捞出 - 煎[溏心蛋](../../breakfast/溏心蛋.md) -- 将[米饭](../../staple/米饭/米饭.md)放在一个碗里 然后倒扣在大碗 +- 将[米饭](../../staple/米饭/电饭煲蒸米饭.md)放在一个碗里 然后倒扣在大碗 - 将准备好的蔬菜和肉卷依次绕圈放在米饭上面 将煎蛋放中间 - 备酱汁 - 两勺韩式辣酱（甜辣口）+ 一勺生抽 + 两瓶盖雪碧（减肥的话 可以放无糖雪碧）+ 少许芝麻 + 一勺芝麻油 diff --git a/tips/learn/微波炉.md b/tips/learn/微波炉.md index 7f472b9d..2e664753 100644 --- a/tips/learn/微波炉.md +++ b/tips/learn/微波炉.md @@ -22,7 +22,7 @@ 中火适用于： -* [烹煮] 海鲜 （例如 [微波葱姜黑鳕鱼](../../dishes/home-cooking/微波葱姜黑鳕鱼.md)） +* [烹煮] 海鲜 （例如 [微波葱姜黑鳕鱼](../../dishes/aquatic/微波葱姜黑鳕鱼.md)） * [烹煮] 软化肉类 * [脱水] 干燥蔬果皮 * [脱水] 制作肉干 From 68c058f01b35bddda4669d9096137e397567cba9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 4 Mar 2022 16:40:36 +0000 Subject: [PATCH 15/16] [ci skip] Automatic file changes/fix --- mkdocs.yml | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml index 81b91f6b..7b948546 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -112,38 +112,27 @@ nav: - 荤菜: - 白菜猪肉炖粉条: ./dishes/meat_dish/白菜猪肉炖粉条.md - - 白灼虾: ./dishes/meat_dish/白灼虾/白灼虾.md - - 鳊鱼炖豆腐: ./dishes/meat_dish/鳊鱼炖豆腐/鳊鱼炖豆腐.md - 宫保鸡丁: ./dishes/meat_dish/宫保鸡丁/宫保鸡丁.md - 咕噜肉: ./dishes/meat_dish/咕噜肉.md - - 红烧鲤鱼: ./dishes/meat_dish/红烧鲤鱼.md - 简易红烧肉: ./dishes/meat_dish/红烧肉/简易红烧肉.md - 南派红烧肉: ./dishes/meat_dish/红烧肉/南派红烧肉.md - - 红烧鱼头: ./dishes/meat_dish/红烧鱼头.md - 红烧猪蹄: ./dishes/meat_dish/红烧猪蹄/红烧猪蹄.md - 黄瓜炒肉: ./dishes/meat_dish/黄瓜炒肉.md - - 黄油煎虾: ./dishes/meat_dish/黄油煎虾/黄油煎虾.md - 回锅肉: ./dishes/meat_dish/回锅肉.md - - 烤鱼: ./dishes/meat_dish/混合烤鱼/烤鱼.md - 茄子炖土豆: ./dishes/meat_dish/茄子炖土豆.md - 尖椒炒牛肉: ./dishes/meat_dish/尖椒炒牛肉.md - 姜炒鸡: ./dishes/meat_dish/姜炒鸡/姜炒鸡.md - 酱牛肉: ./dishes/meat_dish/酱牛肉/酱牛肉.md - - 咖喱炒蟹: ./dishes/meat_dish/咖喱炒蟹.md - 可乐鸡翅: ./dishes/meat_dish/可乐鸡翅.md - 口水鸡: ./dishes/meat_dish/口水鸡/口水鸡.md - 辣椒炒肉: ./dishes/meat_dish/辣椒炒肉.md - 老式锅包肉: ./dishes/meat_dish/老式锅包肉/老式锅包肉.md - 凉拌鸡丝: ./dishes/meat_dish/凉拌鸡丝/凉拌鸡丝.md - 萝卜炖羊排: ./dishes/meat_dish/萝卜炖羊排.md - - 清蒸鲈鱼: ./dishes/meat_dish/清蒸鲈鱼/清蒸鲈鱼.md - - 清蒸生蚝: ./dishes/meat_dish/清蒸生蚝.md - 水煮牛肉: ./dishes/meat_dish/水煮牛肉/水煮牛肉.md - 水煮肉片: ./dishes/meat_dish/水煮肉片.md - 糖醋里脊: ./dishes/meat_dish/糖醋里脊.md - - 糖醋鲤鱼: ./dishes/meat_dish/糖醋鲤鱼/糖醋鲤鱼.md - 土豆炖排骨: ./dishes/meat_dish/土豆炖排骨/土豆炖排骨.md - - 微波葱姜黑鳕鱼: ./dishes/meat_dish/微波葱姜黑鳕鱼.md - 西红柿牛腩: ./dishes/meat_dish/西红柿牛腩/西红柿牛腩.md - 西红柿土豆炖牛肉: ./dishes/meat_dish/西红柿土豆炖牛肉/西红柿土豆炖牛肉.md - 香干芹菜炒肉: ./dishes/meat_dish/香干芹菜炒肉/香干芹菜炒肉.md @@ -158,6 +147,19 @@ nav: - 鱼香肉丝: ./dishes/meat_dish/鱼香肉丝.md - 孜然牛肉: ./dishes/meat_dish/孜然牛肉.md + - 水产: + - 白灼虾: ./dishes/aquatic/白灼虾/白灼虾.md + - 鳊鱼炖豆腐: ./dishes/aquatic/鳊鱼炖豆腐/鳊鱼炖豆腐.md + - 红烧鲤鱼: ./dishes/aquatic/红烧鲤鱼.md + - 红烧鱼头: ./dishes/aquatic/红烧鱼头.md + - 黄油煎虾: ./dishes/aquatic/黄油煎虾/黄油煎虾.md + - 烤鱼: ./dishes/aquatic/混合烤鱼/烤鱼.md + - 咖喱炒蟹: ./dishes/aquatic/咖喱炒蟹.md + - 清蒸鲈鱼: ./dishes/aquatic/清蒸鲈鱼/清蒸鲈鱼.md + - 清蒸生蚝: ./dishes/aquatic/清蒸生蚝.md + - 糖醋鲤鱼: ./dishes/aquatic/糖醋鲤鱼/糖醋鲤鱼.md + - 微波葱姜黑鳕鱼: ./dishes/aquatic/微波葱姜黑鳕鱼.md + - 早餐: - 茶叶蛋: ./dishes/breakfast/茶叶蛋.md - 鸡蛋三明治: ./dishes/breakfast/鸡蛋三明治.md @@ -201,6 +203,7 @@ nav: - 半成品加工: - 懒人蛋挞: ./dishes/semi-finished/懒人蛋挞/懒人蛋挞.md - 凉皮: ./dishes/semi-finished/凉皮.md + - 薯条: ./dishes/semi-finished/薯条.md - 速冻馄饨: ./dishes/semi-finished/速冻馄饨.md - 速冻水饺: ./dishes/semi-finished/速冻水饺.md - 速冻汤圆: ./dishes/semi-finished/速冻汤圆/速冻汤圆.md From 10dd630101c0e29ce7298b468ff2732783401828 Mon Sep 17 00:00:00 2001 From: Anduin Xue Date: Sat, 5 Mar 2022 00:43:02 +0800 Subject: [PATCH 16/16] CI will check mkdocs build. --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be60ed89..b5c25673 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,5 +13,7 @@ jobs: run: sudo gem install mdl - name: Lint markdown files run: mdl . -r ~MD036,~MD024,~MD004,~MD029 + - name: Try build docs + uses: jnanadarshan/mkdocs-build-action@v1 # Suppress 036 Emphasis used instead of a header # Suppress 024 Multiple headers with the same content