Merge branch 'master' into next

Author: xingoxu

.github/workflows/commit-changelog.yml

@@ -3,7 +3,9 @@ name: Changelog CI
 # Controls when the action will run. Triggers the workflow on a pull request
 on:
   pull_request:
-    # types: [opened, reopened]
+    types: [opened, reopened]
+    branches:
+      - master
 
 jobs:
   build:
@@ -12,23 +14,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          ref: ${{ github.event.pull_request.head.ref }}
           fetch-depth: 0
       - name: Install Dependency
         run: npm i
 
-      - name: Config Internal Git
-        run: |
-          git config --global user.email "action@github.com"
-          git config --global user.name "GitHub Action"
-
-      - name: Run Changelog CI & Bump npm version
-        if: ${{ startsWith(github.event.pull_request.title, 'Release') }}
-        run: npm run generate-changelog
-
-      - name: Copy & Deploy
-        if: ${{ startsWith(github.event.pull_request.title, 'Release') }}
-        run: |
-          git add -A
-          git commit -m '(Changelog CI) Added Changelog'
-          git push
+      - name: Run Changelog CI
+        run: ./scripts/generate-changelog.sh

scripts/generate-changelog.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+git checkout ${GITHUB_HEAD_REF}
+
+git config --global user.email "action@github.com"
+git config --global user.name "GitHub Action"
+
+npm run generate-changelog
+
+git add -A
+git commit -m "(Changelog CI) Added Changelog"
+git push -u origin ${GITHUB_HEAD_REF} --tags

scripts/generate-changelog.ts

@@ -41,7 +41,9 @@ const category = {
 
 commitsArray.forEach((message) => {
   let cat: keyof typeof category;
-  if (message.includes("test")) {
+  if (/^([\d\.]+)$/.test(message)) {
+    return;
+  } else if (message.includes("test")) {
     cat = "miscs";
   } else if (/(add)|(support)/i.test(message)) {
     cat = "features";