Update RSS and Sitemap workflows

Author: sy-records

Diff for: .github/workflows/rss.yml

@@ -1,28 +1,26 @@
 name: RSS
 
-#on: [ push, pull_request ]
-on: [ pull_request, workflow_dispatch ]
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-          ref: ${{ github.head_ref }}
+      - uses: actions/checkout@v4
 
       - name: Install Pandoc
         run:
           sudo apt-get install -y pandoc
 
       - name: Build RSS
-        run: |
-          git pull --rebase
-          cd docs/
+        run:
           ./rss.sh
+        working-directory: docs/
 
       - name: Commit Updated
         uses: stefanzweifel/git-auto-commit-action@v4

Diff for: .github/workflows/sitemap.yml

@@ -1,24 +1,22 @@
 name: Sitemap
 
-#on: [ push, pull_request ]
-on: [ pull_request, workflow_dispatch ]
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-          ref: ${{ github.head_ref }}
+      - uses: actions/checkout@v4
 
       - name: Build Sitemap
-        run: |
-          git pull --rebase
-          cd docs/
+        run:
           ./sitemap.sh
+        working-directory: docs/
 
       - name: Commit Updated
         uses: stefanzweifel/git-auto-commit-action@v4

Diff for: docs/README.md

@@ -1,4 +1,4 @@
-# 关于我
+# 关于我 :id=about
 
 [![博客](https://img.shields.io/badge/Blog-qq52o.me-blue)](https://qq52o.me "沈唁志")
 [![知乎](https://cdn.jsdelivr.net/gh/sy-records/staticfile/images/ico/zhihu.svg)](https://www.zhihu.com/people/sy-records "沈唁")

Diff for: docs/_coverpage.md

@@ -5,6 +5,6 @@
 ## 🍃Don't let your past determine the future. :id=cover-page-hitokoto
 
 [GitHub](https://github.com/sy-records)
-[Getting Started](#main)
+[Getting Started](#about)
 
 ![](https://cdn.jsdelivr.net/gh/sy-records/staticfile/images/202109/home-background.jpg)

Diff for: docs/rss.sh

@@ -4,6 +4,8 @@ feed="feed.xml"
 website_title="沈唁的编程笔记"
 website_link="https://notes.qq52o.me"
 description="沈唁的编程笔记"
+followFeedId=110879509092022272
+followUserId=72226467595413504
 
 urlencode() {
   local length="${#1}"
@@ -49,6 +51,10 @@ rss_content="<rss xmlns:atom=\"http://www.w3.org/2005/Atom\" version=\"2.0\">
   <atom:link href=\"$website_link/$feed\" rel=\"self\" type=\"application/rss+xml\" />
   <link>$website_link</link>
   <description>$description</description>
+  <follow_challenge>
+      <feedId>$followFeedId</feedId>
+      <userId>$followUserId</userId>
+  </follow_challenge>
   $items
 </channel>
 </rss>"

Diff for: docs/tools/git.md

@@ -283,3 +283,10 @@ git push origin :refs/tags/<tagname>
 ```bash
 git checkout branchName -- filepath
 ```
+
+## 生成patch并合并
+
+```bash
+git format-patch -1 commitId -o  ~/GitHub/sy-records/path
+git apply --reject patchfile
+```