chore(misc): bump to node 14, simplify template

benzking · Aug 13, 2021 · 9bc99ce · 9bc99ce
1 parent fe4c82e
commit 9bc99ce
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 66 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,8 +1,6 @@
 <!-- 
-请不要删除已有内容（注释除外）, 这会导致自动检测失败；不符合要求保留默认内容即可
-Do not remove existing titles or structures: it breaks CI
-如果有疑问，可以参考已经合并的PR格式
-Reference to merged PR if you have question over PR format
+如有疑问，请参考 https://github.com/DIYgod/RSSHub/discussions/8002
+Reference: https://github.com/DIYgod/RSSHub/discussions/8002
 -->
 
 ## 该 PR 相关 Issue / Involved issue
@@ -11,61 +9,23 @@ Close #
 
 ## 完整路由地址 / Example for the proposed route(s)
 
-<!--
-为方便测试，请附上完整路由地址（可以真正访问的地址），否则将导致 PR 被关闭
-请按照如下格式填写`routes`区域: 我们将会根据你的参数展开自动测试. 一行一个路由
-如果路由包含在文档中列出可以完全穷举的参数（例如分类），请依次全部列出
-To simplify the testing workflow, please include COMPLETE route URL, with all required and optional parameters, otherwise your pull request will be closed.
-Please fill the `routes` block follow the format below, as we will perform automatic test based on this information. one route per line.
-
-```
-/some/route
-/some/other/route
-```
-
-如果与路由无关, 请写`NOROUTE`
-请不要删除代码块`routes`标识 
-If it is not related to route, use `NOROUTE` to bypass CI
-FILL BELOW and keep `routes` keyword
--->
-
 ```routes
 ```
 
-
 ## 新RSS检查列表 / New RSS Script Checklist
-
-<!-- 
-Please go over the checklist below before PR: this improve your PR pass rate.
-Reference: https://docs.rsshub.app/en/joinus/quick-start.html
-请在提交PR前检查以下事项: 这可以大大提升通过率
-这些就是我们在审核时主要关注的事项, 敬请留意
-参考: https://docs.rsshub.app/joinus/quick-start.html
--->
-
-- [ ] 这个PR中包含了新的路由吗? Does this PR add new route?
-  - 如果有, 请完成检查列表. If yes, please finish the check list
-  - **如果你的PR符合下方某个事项, 也请注明. If any of the checklist item meets your PR, please fill it out.**
-  - [x] <- 这样打勾
-- [ ] 是否提供了文档? Documentation provided?
-  - [ ] 是否提供了英文文档? EN Documentation provided?
-- [ ] 是否支持全文获取? Is this RSS Script support fulltext?
-  - [ ] 如果全文获取中需要访问文章链接, 是否使用了缓存? If fulltext requires to fetch detail pages, is cache used in the process?
-  - [缓存说明](https://docs.rsshub.app/joinus/quick-start.html#ti-jiao-xin-de-rsshub-gui-ze-bian-xie-jiao-ben-shi-yong-huan-cun) | [How to use cache](https://docs.rsshub.app/joinus/quick-start.html#ti-jiao-xin-de-rsshub-gui-ze-bian-xie-jiao-ben-shi-yong-huan-cun)
-- [ ] 目标是否有明显的反爬/频率限制? Is there any sign of anti-bot or rate limit?
-  - [ ] 如果有, 是否有对应的措施? (延长缓存时间, 写文档说明, etc.) If yes, do your code reflect this sign? (e.g. write documentations, use long cache time)
-- [ ] 目标是否有提供日期？ Is there a date in the source?
-  - [ ] 如果有，包是否正确解析？ If there is, can this script provide this info?
-  - [ ] 如果有提供解析能力，时区是否正确调整？ Is the timezone correctly provided?
-  - 如果有提供日期，但是没有提供解析，请说明原因 If there is a date but this script does not parse, please provide your reason.
-- [ ] 是否引入的新的包? Any new package introduced?
-  - 如果有, 请说明原因. If yes, please state your reason
-- [ ] 是否使用了`Puppeteer`? Make use of `Puppeteer`?
-  - 如果有, 请说明原因. If yes, please state your reason
 
+- [ ] New Route
+- [ ] Documentation
+  - [ ] CN
+  - [ ] EN
+- [ ] 全文获取 fulltext
+  - [ ] Use Cache
+- [ ] 反爬/频率限制 anti-bot or rate limit?
+  - [ ] 如果有, 是否有对应的措施? If yes, do your code reflect this sign?
+- [ ] 日期和时间 date and time
+  - [ ] 可以解析 Parsed
+  - [ ] 时区调整 Correct TimeZone
+- [ ] 添加了新的包 New package added 
+- [ ] `Puppeteer`
 
 ## 说明 / Note
-<!-- 
-Please state your reason/note here 
-请在这里描述你的原因或留下其他相关的说明
--->
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -11,9 +11,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-node@v1
+    - uses: actions/setup-node@v2
       with:
         node-version: '14'
+        cache: 'npm'
     - run: yarn install
     - run: npm run format
     - name: Commit files

diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
@@ -12,9 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-node@v1
+    - uses: actions/setup-node@v2
       with:
         node-version: '14'
+        cache: 'npm'
         registry-url: 'https://registry.npmjs.org'
     - name: Release
       run: |

diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml
@@ -7,10 +7,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-node@v1
+    - uses: actions/setup-node@v2
       with:
         node-version: '14'
-    - run: yarn install
+        cache: 'npm'
+    - run: npm ci
     - name: Lint
       run: |
         npm run lint

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,11 +15,11 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x]
+        node-version: [14.x]
 
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-node@v1
+    - uses: actions/setup-node@v2
       with:
         node-version: ${{ matrix.node-version }}
     - run: npm ci

diff --git a/Dockerfile b/Dockerfile
@@ -7,7 +7,7 @@ ARG PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1;
 
 RUN ln -sf /bin/bash /bin/sh
 
-RUN apt-get update && apt-get install -yq libgconf-2-4 apt-transport-https git dumb-init python build-essential --no-install-recommends
+RUN apt-get update && apt-get install -yq libgconf-2-4 apt-transport-https git dumb-init python3 build-essential --no-install-recommends
 
 WORKDIR /app
 COPY . /app

diff --git a/package-lock.json b/package-lock.json