From 9d54bcd114f8c8704edcdd0476361143748fc9fb Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 3 Oct 2021 14:34:23 +0800 Subject: [PATCH] Actions: Show commit and messages. --- .github/workflows/release.yml | 7 ++++++- trunk/auto/depends.sh | 1 - trunk/auto/options.sh | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 739344ea4..e9d8d0172 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,13 +31,15 @@ jobs: # Create source tar for release # Generate variables like: # SRS_SOURCE_TAR=srs-server-4.0.145.tar.gz + # SRS_SOURCE_MD5=83e38700a80a26e30b2df054e69956e5 - name: Create source tar.gz run: | DEST_DIR=srs-server-$(echo ${SRS_TAG}| sed 's/^v//g') && mkdir -p $DEST_DIR && cp README.md $DEST_DIR && cp LICENSE $DEST_DIR && cp -R trunk $DEST_DIR/trunk && (cd $DEST_DIR/trunk/3rdparty && rm -rf *.zip openssl-*.gz srs-bench) && + tar zcf ${DEST_DIR}.tar.gz ${DEST_DIR} && du -sh ${DEST_DIR}* && rm -rf ${DEST_DIR} && echo "SRS_SOURCE_TAR=${DEST_DIR}.tar.gz" >> $GITHUB_ENV && - tar zcf ${DEST_DIR}.tar.gz ${DEST_DIR} && du -sh ${DEST_DIR}* && rm -rf ${DEST_DIR} + echo "SRS_SOURCE_MD5=$(md5sum ${DEST_DIR}.tar.gz| awk '{print $1}')" >> $GITHUB_ENV ################################################################ # Tests @@ -108,6 +110,9 @@ jobs: with: tag_name: ${{ github.ref }} release_name: Release ${{ github.ref }} + body: | + ${{ github.event.head_commit.message }} + ${{ env.SRS_SOURCE_MD5 }} ${{ env.SRS_SOURCE_TAR }} draft: false prerelease: true # Upload release files diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 887b36ea3..a546fe692 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -530,7 +530,6 @@ if [[ $SRS_SSL == YES && $SRS_USE_SYS_SSL != YES ]]; then OPENSSL_CONFIG="./Configure linux-generic32" if [[ $SRS_CROSS_BUILD_ARCH == "arm" ]]; then OPENSSL_CONFIG="./Configure linux-armv4"; fi if [[ $SRS_CROSS_BUILD_ARCH == "aarch64" ]]; then OPENSSL_CONFIG="./Configure linux-aarch64"; fi - if [[ $SRS_CROSS_BUILD_ARCH == "mipsel" ]]; then OPENSSL_CONFIG="./Configure linux-mips32"; fi elif [[ ! -f ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib/libssl.a ]]; then # Try to use exists libraries. if [[ -f /usr/local/ssl/lib/libssl.a && $SRS_SSL_LOCAL == NO ]]; then diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index 87a3915ce..ee36b4f7e 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -418,7 +418,6 @@ function apply_auto_options() { if [[ $SRS_CROSS_BUILD_ARCH == "" ]]; then echo $SRS_TOOL_CC| grep arm >/dev/null 2>&1 && SRS_CROSS_BUILD_ARCH="arm" echo $SRS_TOOL_CC| grep aarch64 >/dev/null 2>&1 && SRS_CROSS_BUILD_ARCH="aarch64" - echo $SRS_TOOL_CC| grep mipsel >/dev/null 2>&1 && SRS_CROSS_BUILD_ARCH="mipsel" fi echo "For cross build, host: $SRS_CROSS_BUILD_HOST, prefix: $SRS_CROSS_BUILD_PREFIX, arch: $SRS_CROSS_BUILD_ARCH, cpu: $SRS_CROSS_BUILD_CPU gcc: $SRS_TOOL_CC" fi