🔀 Merge pull request #805

CI: 减少 action 冗余运行

.github/workflows/codecov.yml

@@ -4,13 +4,15 @@ on:
   push:
     branches:
       - master
-      - dev
   pull_request:
 
 jobs:
   test:
     name: Test Coverage
     runs-on: ${{ matrix.os }}
+    concurrency:
+      group: test-coverage-${{ github.ref }}-${{ matrix.os }}-${{ matrix.python-version }}
+      cancel-in-progress: true
     strategy:
       matrix:
         python-version: ["3.7", "3.8", "3.9", "3.10"]

.github/workflows/release-drafter.yml

@@ -14,11 +14,17 @@ jobs:
   update-release-draft:
     if: github.event_name == 'pull_request_target'
     runs-on: ubuntu-latest
+    concurrency:
+      group: pull-request-changelog
+      cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2
         with:
           token: ${{ secrets.GH_TOKEN }}
 
+      - name: Setup Node Environment
+        uses: ./.github/actions/setup-node
+
       - uses: release-drafter/release-drafter@v5
         id: release-drafter
         env:
@@ -29,7 +35,20 @@ jobs:
         with:
           changelog_file: website/src/pages/changelog.md
           latest_changes_position: '# 更新日志\n\n'
+          latest_changes_title: '## 最近更新'
+          replace_regex: '(?<=## 最近更新\n)[\s\S]*?(?=\n## )'
           changelog_body: ${{ steps.release-drafter.outputs.body }}
+          commit_and_push: false
+
+      - name: Commit and Push
+        run: |
+          yarn prettier
+          git config user.name github-actions[bot]
+          git config user.email github-actions[bot]@users.noreply.github.com
+          git add .
+          git commit -m ":memo: Update changelog"
+          git push
+
 
   release:
     if: startsWith(github.ref, 'refs/tags/')

.github/workflows/release.yml

@@ -28,10 +28,14 @@ jobs:
         uses: docker://ghcr.io/nonebot/auto-changelog:master
         with:
           changelog_file: website/src/pages/changelog.md
+          archive_regex: '(?<=## )最近更新(?=\n)'
           archive_title: ${{ env.TAG_NAME }}
+          commit_and_push: false
 
       - name: Archive Files
-        run: yarn archive $(poetry version -s)
+        run: |
+          yarn archive $(poetry version -s)
+          yarn prettier
 
       - name: Push Tag
         run: |

.github/workflows/website-deploy.yml

@@ -4,21 +4,18 @@ on:
   push:
     branches:
       - master
-      - dev
   pull_request_target:
 
 jobs:
   publish:
+    if: github.event_name == 'push'
     runs-on: ubuntu-latest
+    concurrency:
+      group: website-deploy-${{ github.ref }}
+      cancel-in-progress: true
 
     steps:
       - uses: actions/checkout@v2
-        if: github.event_name == 'push'
-
-      - uses: actions/checkout@v2
-        if: github.event_name != 'push'
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Setup Python Environment
         uses: ./.github/actions/setup-python
@@ -35,23 +32,52 @@ jobs:
       - name: Get Branch Name
         run: echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_ENV
 
-      - name: Get Deploy Name
+      - name: Deploy to Netlify
-        if: github.event_name == 'push'
+        uses: nwtgck/actions-netlify@v1
-        run: |
+        with:
-          echo "DEPLOY_NAME=${{ env.BRANCH_NAME }}" >> $GITHUB_ENV
+          publish-dir: "./website/build"
-          echo "PRODUCTION=${{ env.BRANCH_NAME == 'master' }}" >> $GITHUB_ENV
+          production-deploy: true
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          deploy-message: "Deploy ${{ env.BRANCH_NAME }}@${{ github.sha }}"
+          enable-commit-comment: false
+          alias: ${{ env.BRANCH_NAME }}
+        env:
+          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+          NETLIFY_SITE_ID: ${{ secrets.SITE_ID }}
+
+  preview:
+    if: github.event_name == 'pull_request_target'
+    runs-on: ubuntu-latest
+    concurrency:
+      group: pull-request-preview-${{ github.event.number }}
+      cancel-in-progress: true
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Setup Python Environment
+        uses: ./.github/actions/setup-python
+
+      - name: Setup Node Environment
+        uses: ./.github/actions/setup-node
+
+      - name: Build API Doc
+        uses: ./.github/actions/build-api-doc
+
+      - name: Build Doc
+        run: yarn build
 
       - name: Get Deploy Name
-        if: github.event_name != 'push'
         run: |
           echo "DEPLOY_NAME=deploy-preview-${{ github.event.number }}" >> $GITHUB_ENV
-          echo "PRODUCTION=false" >> $GITHUB_ENV
 
       - name: Deploy to Netlify
         uses: nwtgck/actions-netlify@v1
         with:
           publish-dir: "./website/build"
-          production-deploy: ${{ env.PRODUCTION }}
+          production-deploy: false
           github-token: ${{ secrets.GITHUB_TOKEN }}
           deploy-message: "Deploy ${{ env.DEPLOY_NAME }}@${{ github.sha }}"
           enable-commit-comment: false

.pre-commit-config.yaml

@@ -1,8 +1,8 @@
 ci:
   autofix_commit_msg: ":rotating_light: auto fix by pre-commit hooks"
   autofix_prs: true
-  autoupdate_branch: dev
+  autoupdate_branch: master
-  autoupdate_schedule: weekly
+  autoupdate_schedule: monthly
   autoupdate_commit_msg: ":arrow_up: auto update by pre-commit hooks"
 repos:
   - repo: https://github.com/pycqa/isort

website/src/pages/changelog.md

@@ -4,7 +4,7 @@ description: Changelog
 
 # 更新日志
 
-## Latest changes
+## 最近更新
 
 ### 💫 杂项
 
@@ -13,14 +13,7 @@ description: Changelog
 
 ### 🍻 插件发布
 
-- Plugin: pixiv.net p站查询图片 [@yanyongyu](https://github.com/yanyongyu) ([#803](https://github.com/nonebot/nonebot2/pull/803))
+- Plugin: pixiv.net p 站查询图片 [@yanyongyu](https://github.com/yanyongyu) ([#803](https://github.com/nonebot/nonebot2/pull/803))
-
-## Latest changes
-
-### 💫 杂项
-
-- CI: fix ci permission error [@yanyongyu](https://github.com/yanyongyu) ([#802](https://github.com/nonebot/nonebot2/pull/802))
-- CI: 添加更新日志自动更新 action [@yanyongyu](https://github.com/yanyongyu) ([#799](https://github.com/nonebot/nonebot2/pull/799))
 
 ## v2.0.0-beta.2