From 8fb75c69f110192897a0530b816ce79c0c72bea0 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sat, 12 Nov 2022 11:34:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?:octocat:=20=E6=9B=B4=E6=96=B0=20GitHub=20A?= =?UTF-8?q?ctions=20CI=20=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/parse-changelog.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/parse-changelog.py b/scripts/parse-changelog.py index 3104f7ba9..0bad77e2a 100644 --- a/scripts/parse-changelog.py +++ b/scripts/parse-changelog.py @@ -6,11 +6,11 @@ from collections import defaultdict import github docmap = { + "Feature": "引入特性", "Enhancement": "改进功能", + "Bug": "修复缺陷", "Document": "文档相关", "Refactor": "开发重构", - "Bug": "修复缺陷", - "Feature": "引入特性", "Abolishment": "移除功能" } From b9186d2cdfc8bbb2921093d342b196c1cc7bc2db Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sat, 12 Nov 2022 11:37:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?:octocat:=20=E6=9B=B4=E6=96=B0=20GitHub=20A?= =?UTF-8?q?ctions=20CI=20=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 5 ----- scripts/win-build.bat | 1 - 2 files changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c7c1becc4..4acbbb5ed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -161,11 +161,6 @@ jobs: with: path: ${{ github.workspace }}/go/src/github.com/siyuan-note/siyuan/app/kernel-linux - - name: Remove Kernel Directory for Windows 32bit - uses: JesseTG/rm@v1.0.2 - with: - path: ${{ github.workspace }}/go/src/github.com/siyuan-note/siyuan/app/kernel32 - - name: Remove Kernel Directory for Windows uses: JesseTG/rm@v1.0.2 with: diff --git a/scripts/win-build.bat b/scripts/win-build.bat index 2b20ac057..91e7e34cf 100644 --- a/scripts/win-build.bat +++ b/scripts/win-build.bat @@ -7,7 +7,6 @@ cd .. echo 'Cleaning Builds' del /S /Q /F app\build 1>nul del /S /Q /F app\kernel 1>nul -del /S /Q /F app\kernel32 1>nul echo 'Building Kernel' go version From 6ca128aeebd43f1eaddb00689eb0f3daa49256c3 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sat, 12 Nov 2022 11:38:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?:octocat:=20=E6=9B=B4=E6=96=B0=20GitHub=20A?= =?UTF-8?q?ctions=20CI=20=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4acbbb5ed..0819ae84f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -166,12 +166,12 @@ jobs: with: path: ${{ github.workspace }}/go/src/github.com/siyuan-note/siyuan/app/kernel - - name: Remove Kernel Directory for Mac + - name: Remove Kernel Directory for macOS uses: JesseTG/rm@v1.0.2 with: path: ${{ github.workspace }}/go/src/github.com/siyuan-note/siyuan/app/kernel-darwin - - name: Remove Kernel Directory for Mac M1 + - name: Remove Kernel Directory for macOS ARM64 uses: JesseTG/rm@v1.0.2 with: path: ${{ github.workspace }}/go/src/github.com/siyuan-note/siyuan/app/kernel-darwin-arm64