再调整发给telegram的更新日志

AoEiuV020 · Mar 14, 2022 · 9aeab23 · 9aeab23
1 parent 27abd4a
commit 9aeab23
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -29,8 +29,10 @@ jobs:
               if [[ -z "$RELEASE_BODY" ]]
               then
                   RELEASE_BODY='### ${{ github.event.head_commit.message }}'
+                  TG_CHANGELOG="$(echo "$RELEASE_BODY"|sed -n "s/### \(.*\)/\1/p" |sed -n '{;=;p}' | sed "N;s/\n/. /g")"
+              else
+                  TG_CHANGELOG=$(./latest-changelog.sh $BUILD_VERSION |sed '/^$/,$d;1d' |sed -n '{;=;p}' | sed "N;s/\n/. /g")
               fi
-              TG_CHANGELOG=$(./latest-changelog.sh $BUILD_VERSION |sed '/^$/,$d;1d' |sed -n '{;=;p}' | sed "N;s/\n/. /g")
           elif [[ ${GITHUB_REF} == refs/pull* ]]
           then
               CREATE_RELEASE="false"
@@ -42,7 +44,7 @@ jobs:
               echo PRE_RELEASE="true" >> .custom_env
               BUILD_VERSION="$(date +'%Y%m%d%H%M%S')"
               RELEASE_BODY=$(echo '${{ toJson(github.event.commits) }}' |jq -r 'map("### "+.message)|join("\n\n------\n")')
-              TG_CHANGELOG=$(echo "$RELEASE_BODY"|sed -n "s/### \(.*\)/\1/p" |sed -n '{;=;p}' | sed "N;s/\n/. /g")
+              TG_CHANGELOG="$(echo "$RELEASE_BODY"|sed -n "s/### \(.*\)/\1/p" |sed -n '{;=;p}' | sed "N;s/\n/. /g")"
               VERSION_PREFIX='内测版-'
           fi
           BUILD_NAME_WITH_VERSION="$BUILD_NAME-$BUILD_VERSION"