Merge branch 'master' into renovate/sass-1.x-lockfile

DrAugus · Jun 18, 2024 · 6955b0a · 6955b0a
2 parents 8f7a655 + 70b992b
commit 6955b0a
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 14 deletions.
diff --git a/.github/workflows/deploy-game.yml b/.github/workflows/deploy-game.yml
@@ -8,6 +8,8 @@ on:
     paths:
       - "game/**"
       - ".github/workflows/deploy-game.yml"
+      - "**/package.json"
+      - "**/pnpm-lock.yaml"
   # 手动触发部署
   # workflow_dispatch:
   pull_request:

diff --git a/.github/workflows/deploy-life.yml b/.github/workflows/deploy-life.yml
@@ -7,6 +7,8 @@ on:
     paths:
       - "life/**"
       - ".github/workflows/deploy-life.yml"
+      - "**/package.json"
+      - "**/pnpm-lock.yaml"
   pull_request:
     types: [opened, synchronize]
     branches:

diff --git a/.github/workflows/get-mhy-wish.yml b/.github/workflows/get-mhy-wish.yml
@@ -56,7 +56,7 @@ jobs:
       #     github_token: ${{ secrets.DEPLOY_GH }}
       #     branch: ${{ github.head_ref }}
       - name: Create Pull Request
-        if: ${{ steps.commit.outputs.has_changes == true }}
+        if: ${{ steps.commit.outputs.has_changes == 'true' }}
         uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.DEPLOY_GH }}

diff --git a/.github/workflows/life-recent-update.yml b/.github/workflows/life-recent-update.yml
@@ -68,7 +68,7 @@ jobs:
       #     github_token: ${{ secrets.DEPLOY_GH }}
       #     branch: ${{ github.head_ref }}
       - name: Create Pull Request
-        if: ${{ steps.commit.outputs.has_changes == true }}
+        if: ${{ steps.commit.outputs.has_changes == 'true' }}
         uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.DEPLOY_GH }}

diff --git a/life/.vitepress/data/recent.json b/life/.vitepress/data/recent.json
@@ -1,6 +1,18 @@
 {
     "title": "",
     "items": [
+        {
+            "title": "Mergify",
+            "desc": "Mergify github 官方支持 [auto merge][github auto merg",
+            "link": "/code/build/mergify",
+            "date": "2024-06-17"
+        },
+        {
+            "title": "GitHub",
+            "desc": "GitHub hub 自动建仓 ```bash hub create [-poc] [-d ] [",
+            "link": "/code/version-ctrl/github",
+            "date": "2024-06-17"
+        },
         {
             "title": "中国有14亿人，而我还是单身",
             "desc": "中国有14亿人，而我还是单身 转载自有理数 ::: > 我国每5个成年人中就有1个是单身。 人口",
@@ -108,18 +120,6 @@
             "desc": "中文 import Chinese from '../../../.vitepress/compo",
             "link": "/course/literature/language/chinese",
             "date": "2024-06-13"
-        },
-        {
-            "title": "英语单词",
-            "desc": "英语单词 import WordsEnglish from '../../../.vitepres",
-            "link": "/course/literature/language/english-words",
-            "date": "2024-06-13"
-        },
-        {
-            "title": "英语简单句",
-            "desc": "英语简单句 import SentenceEnglish from '../../../.vite",
-            "link": "/course/literature/language/english",
-            "date": "2024-06-13"
         }
     ]
 }
diff --git a/script/auto/latest.json b/script/auto/latest.json
@@ -1,4 +1,12 @@
 {
+    "life/code/build/mergify.md": {
+        "title": "Mergify",
+        "date": 1718590917.0
+    },
+    "life/code/version-ctrl/github.md": {
+        "title": "GitHub",
+        "date": 1718590917.0
+    },
     "life/random-notes/bachelor.md": {
         "title": "中国有14亿人，而我还是单身",
         "date": 1718357794.0