From f3c67c7a09b3dd824ec349cb0abcca50c1c70162 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 3 Oct 2021 07:26:43 +0800 Subject: [PATCH 1/2] Actions: Refine source tar file --- .github/workflows/release.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2174df10c..6221209b9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,6 +28,14 @@ jobs: echo "SRS_TAG=$SRS_TAG" >> $GITHUB_ENV SRS_MAJOR=$(echo $SRS_TAG| cut -c 2) echo "SRS_MAJOR=$SRS_MAJOR" >> $GITHUB_ENV + # Create source tar for release + - name: Create source tar.gz + run: | + DEST_DIR=srs-$(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) && + 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} ################################################################ # Tests @@ -89,15 +97,6 @@ jobs: kubectl describe deploy/srs4-deploy ################################################################ - # Create source tar for release - - name: Create source tar.gz - run: | - DEST_DIR=srs-$(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) && - echo "SRS_SOURCE_TAR=${DEST_DIR}.tar.gz" >> $GITHUB_ENV && - tar zcf ${DEST_DIR}.tar.gz ${DEST_DIR} && - du -sh ${DEST_DIR}* # Create release. - name: Create release id: create_release From efbff98046786a85e88436f6e4197bbfd48a233c Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 3 Oct 2021 07:39:40 +0800 Subject: [PATCH 2/2] Actions: Create source tar lik srs-server-4.0.165.tar.gz --- .github/workflows/release.yml | 4 +++- trunk/doc/CHANGELOG.md | 1 + trunk/src/core/srs_core_version4.hpp | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6221209b9..739344ea4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,9 +29,11 @@ jobs: SRS_MAJOR=$(echo $SRS_TAG| cut -c 2) echo "SRS_MAJOR=$SRS_MAJOR" >> $GITHUB_ENV # Create source tar for release + # Generate variables like: + # SRS_SOURCE_TAR=srs-server-4.0.145.tar.gz - name: Create source tar.gz run: | - DEST_DIR=srs-$(echo ${SRS_TAG}| sed 's/^v//g') && mkdir -p $DEST_DIR && + 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) && echo "SRS_SOURCE_TAR=${DEST_DIR}.tar.gz" >> $GITHUB_ENV && diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index faf888e21..b0d4730de 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -8,6 +8,7 @@ The changelog for SRS. ## SRS 4.0 Changelog +* v4.0, 2021-10-03, Actions: Create source tar lik srs-server-4.0.165.tar.gz * v4.0, 2021-09-23, Merge [#2578](https://github.com/ossrs/srs/pull/2578) Support http callback on_play/stop. 4.0.163 * v4.0, 2021-09-23, Merge [#2618](https://github.com/ossrs/srs/pull/2618) to fix FUA bug. * v4.0, 2021-09-05, RTC: Merge [#2581](https://github.com/ossrs/srs/pull/2581), Fix listen ipv6 and port. 4.0.161 diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index 51c47042d..9e85d9a0e 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 4 #define VERSION_MINOR 0 -#define VERSION_REVISION 164 +#define VERSION_REVISION 165 #endif