diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 422786152..df48d83bc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,7 @@ name: "Release" on: push: tags: - - v5* + - v6* jobs: envs: @@ -14,13 +14,13 @@ jobs: # Git checkout - name: Checkout repository uses: actions/checkout@v3 - # The github.ref is, for example, refs/tags/v5.0.145 or refs/tags/v5.0-r8 + # The github.ref is, for example, refs/tags/v6.0.145 or refs/tags/v6.0-r8 # Generate variables like: - # SRS_TAG=v5.0-r8 - # SRS_TAG=v5.0.145 - # SRS_VERSION=5.0.145 - # SRS_VERSION=5.0-r8 - # SRS_MAJOR=5 + # SRS_TAG=v6.0-r8 + # SRS_TAG=v6.0.145 + # SRS_VERSION=6.0.145 + # SRS_VERSION=6.0-r8 + # SRS_MAJOR=6 # @see https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable - name: Generate varaiables run: | @@ -178,7 +178,7 @@ jobs: # Create source tar for release. Note that it's for OpenWRT package srs-server, so the filename MUST be # srs-server-xxx.tar.gz, because the package is named srs-server. # Generate variables like: - # SRS_SOURCE_TAR=srs-server-5.0.145.tar.gz + # SRS_SOURCE_TAR=srs-server-6.0.145.tar.gz # SRS_SOURCE_MD5=83e38700a80a26e30b2df054e69956e5 - name: Create source tar.gz run: | @@ -190,7 +190,7 @@ jobs: echo "SRS_SOURCE_MD5=$(md5sum ${DEST_DIR}.tar.gz| awk '{print $1}')" >> $GITHUB_ENV # Create package tar for release # Generate variables like: - # SRS_PACKAGE_ZIP=SRS-CentOS7-x86_64-5.0.145.zip + # SRS_PACKAGE_ZIP=SRS-CentOS7-x86_64-6.0.145.zip # SRS_PACKAGE_MD5=3880a26e30b283edf05700a4e69956e5 - name: Create package zip env: @@ -265,7 +265,7 @@ jobs: --output "type=image,push=true" \ -t ossrs/srs:$SRS_TAG --build-arg SRS_AUTO_PACKAGER=$PACKAGER -f trunk/Dockerfile . # Docker alias images - # TODO: FIXME: If stable, please set the latest from 4.0 to 5.0 + # TODO: FIXME: If stable, please set the latest from 5.0 to 6.0 - name: Docker alias images for ossrs/srs uses: akhilerm/tag-push-action@v2.0.0 with: @@ -289,7 +289,7 @@ jobs: echo "SRS_VERSION=${{ needs.envs.outputs.SRS_VERSION }}" >> $GITHUB_ENV echo "SRS_MAJOR=${{ needs.envs.outputs.SRS_MAJOR }}" >> $GITHUB_ENV # Aliyun ACR - # TODO: FIXME: If stable, please set the latest from 4.0 to 5.0 + # TODO: FIXME: If stable, please set the latest from 5.0 to 6.0 - name: Login aliyun hub uses: docker/login-action@v1 with: @@ -399,8 +399,8 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 # Create release. - # TODO: FIXME: Refine the release when 5.0 released - # TODO: FIXME: Change prerelease to false when 5.0 released + # TODO: FIXME: Refine the release when 6.0 released + # TODO: FIXME: Change prerelease to false when 6.0 released - name: Update release id: update_release uses: ncipollo/release-action@v1 diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 2eb000016..df163121b 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -8,9 +8,10 @@ The changelog for SRS. ## SRS 6.0 Changelog -* v5.0, 2022-12-26, For [#465](https://github.com/ossrs/srs/issues/465): TS: Support disable audio or video to make mpegts.js happy. v6.0.9 -* v5.0, 2022-12-26, For [#465](https://github.com/ossrs/srs/issues/465): TS: Fix bug for codec detecting for HTTP-TS. v6.0.8 -* v5.0, 2022-12-25, For [#296](https://github.com/ossrs/srs/issues/296): Fix [#3338](https://github.com/ossrs/srs/issues/3338): MP3: Support play HTTP-MP3 by H5(srs-player). v6.0.7 +* v6.0, 2022-12-30, Support first SRS6 version. v6.0.10 +* v6.0, 2022-12-26, For [#465](https://github.com/ossrs/srs/issues/465): TS: Support disable audio or video to make mpegts.js happy. v6.0.9 +* v6.0, 2022-12-26, For [#465](https://github.com/ossrs/srs/issues/465): TS: Fix bug for codec detecting for HTTP-TS. v6.0.8 +* v6.0, 2022-12-25, For [#296](https://github.com/ossrs/srs/issues/296): Fix [#3338](https://github.com/ossrs/srs/issues/3338): MP3: Support play HTTP-MP3 by H5(srs-player). v6.0.7 * v6.0, 2022-12-17, Merge 5.0: FLV header and SRT bugfix. v6.0.6 * v6.0, 2022-12-04, Merge [#3271](https://github.com/ossrs/srs/pull/3271): H265: The codec information is incorrect. v6.0.5 * v6.0, 2022-11-23, Merge [#3275](https://github.com/ossrs/srs/pull/3275): H265: Support HEVC over HTTP-TS. v6.0.4 diff --git a/trunk/src/core/srs_core_version6.hpp b/trunk/src/core/srs_core_version6.hpp index dd35a6e6a..efa721d44 100644 --- a/trunk/src/core/srs_core_version6.hpp +++ b/trunk/src/core/srs_core_version6.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 6 #define VERSION_MINOR 0 -#define VERSION_REVISION 9 +#define VERSION_REVISION 10 #endif