chore(ci): 优化ci, 修复ci问题

qwertyyb · May 6, 2023 · 4f17bcd · 4f17bcd
1 parent fadf584
commit 4f17bcd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   create_release:
     runs-on: ubuntu-latest
-    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'master'
+    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'master' || github.event_name == 'workflow_dispatch'
     steps:
       - uses: actions/checkout@v2
 
@@ -124,7 +124,7 @@ jobs:
     - name: load changelog to env
       id: load_changelog
       run: |
-        changelog=`cat tmp/changelog_html`
+        changelog=`cat tmp/changelog_html | xargs`
         echo "changelog_html=${changelog}" >> $GITHUB_OUTPUT
 
     - name: generate appcast.xml

diff --git a/scripts/common.sh b/scripts/common.sh
@@ -3,6 +3,7 @@
 PROJECT_ROOT="$(cd "$(dirname "$BASH_SOURCE")/.."; pwd)"
 TARGET="Fire"
 WORKSPACE="$PROJECT_ROOT/${TARGET}.xcworkspace"
+APP_NAME="业火输入法"
 
 EXPORT_PATH="$PROJECT_ROOT/dist"
 EXPORT_ARCHIVE="$EXPORT_PATH/archive.xcarchive"

diff --git a/scripts/d_build_appcast.sh b/scripts/d_build_appcast.sh
@@ -40,7 +40,7 @@ cat>$EXPORT_PATH/appcast.xml<<EOF
 <?xml version="1.0" standalone="yes"?>
 <rss xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" version="2.0">
     <channel>
-        <title>Fire</title>
+        <title>${APP_NAME}</title>
         <item>
             <title>${version}</title>
             <pubDate>$(date -R)</pubDate>