From 1f4b103f3fd4af6d08d1b46b5599f51b28e92944 Mon Sep 17 00:00:00 2001 From: fxliang Date: Thu, 30 Nov 2023 17:57:52 +0800 Subject: [PATCH] fix c1f24cf. and add error detection in ci workflow. (#1036) --- .github/workflows/commit-ci.yml | 5 ++++- .github/workflows/release-ci.yml | 4 ++++ RimeWithWeasel/RimeWithWeasel.cpp | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/commit-ci.yml b/.github/workflows/commit-ci.yml index 2dd3d3f5d..8662e3dcb 100644 --- a/.github/workflows/commit-ci.yml +++ b/.github/workflows/commit-ci.yml @@ -55,11 +55,13 @@ jobs: .\build.bat data .\build.bat hant .\build.bat installer - + if: ${{ success() }} + - name: Compress Debug Symbols shell: pwsh run: | Compress-Archive -Path output\*.pdb -CompressionLevel Optimal -DestinationPath .\output\archives\symbols.zip + if: ${{ success() }} - name: Upload artifacts uses: actions/upload-artifact@v3 @@ -68,3 +70,4 @@ jobs: path: | .\output\archives\weasel*.exe .\output\archives\symbols.zip + if: ${{ success() }} diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 16e43ce56..709e98978 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -50,16 +50,19 @@ jobs: .\build.bat data .\build.bat hant .\build.bat installer + if: ${{ success() }} - name: Compress Debug Symbols shell: pwsh run: | Compress-Archive -Path output\*.pdb -CompressionLevel Optimal -DestinationPath .\output\archives\symbols.zip + if: ${{ success() }} - name: Extract changelog shell: pwsh run: | .\extract_changelog.ps1 + if: ${{ success() }} - name: Release uses: softprops/action-gh-release@v1 @@ -68,3 +71,4 @@ jobs: ./output/archives/weasel*.exe ./output/archives/symbols.zip body_path: ${{ github.workspace }}/RELEASE_CHANGELOG.md + if: ${{ success() }} diff --git a/RimeWithWeasel/RimeWithWeasel.cpp b/RimeWithWeasel/RimeWithWeasel.cpp index 1a7a43c6a..0145d0b19 100644 --- a/RimeWithWeasel/RimeWithWeasel.cpp +++ b/RimeWithWeasel/RimeWithWeasel.cpp @@ -957,7 +957,7 @@ static void _UpdateUIStyle(RimeConfig* config, UI* ui, bool initialize) {std::string("vertical"), true} }; bool _text_orientation_bool = false; - _RimeParseStringOptWithFallback(config, "style/text_orientation", _text_orientation_bool, _text_orientation, false); + _RimeParseStringOpt(config, "style/text_orientation", _text_orientation_bool, _text_orientation); if(_text_orientation_bool) style.layout_type = UIStyle::LAYOUT_VERTICAL_TEXT; _RimeGetStringWithFunc(config, "style/label_format", style.label_text_format);