external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Support first SRS6 version. v6.0.10

Browse source
This commit is contained in:
winlin 2022-12-30 19:27:43 +08:00
parent 4bc716179b
commit 39c9487a73
3 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

26
.github/workflows/release.yml vendored
View file

@ -4,7 +4,7 @@ name: "Release"
on: on:
push: push:
tags: tags:
- v5* - v6*
jobs: jobs:
envs: envs:
@ -14,13 +14,13 @@ jobs:
# Git checkout # Git checkout
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 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: # Generate variables like:
# SRS_TAG=v5.0-r8 # SRS_TAG=v6.0-r8
# SRS_TAG=v5.0.145 # SRS_TAG=v6.0.145
# SRS_VERSION=5.0.145 # SRS_VERSION=6.0.145
# SRS_VERSION=5.0-r8 # SRS_VERSION=6.0-r8
# SRS_MAJOR=5 # SRS_MAJOR=6
# @see https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable # @see https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
- name: Generate varaiables - name: Generate varaiables
run: | 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 # 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. # srs-server-xxx.tar.gz, because the package is named srs-server.
# Generate variables like: # 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 # SRS_SOURCE_MD5=83e38700a80a26e30b2df054e69956e5
- name: Create source tar.gz - name: Create source tar.gz
run: | run: |
@ -190,7 +190,7 @@ jobs:
echo "SRS_SOURCE_MD5=$(md5sum ${DEST_DIR}.tar.gz| awk '{print $1}')" >> $GITHUB_ENV echo "SRS_SOURCE_MD5=$(md5sum ${DEST_DIR}.tar.gz| awk '{print $1}')" >> $GITHUB_ENV
# Create package tar for release # Create package tar for release
# Generate variables like: # 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 # SRS_PACKAGE_MD5=3880a26e30b283edf05700a4e69956e5
- name: Create package zip - name: Create package zip
env: env:
@ -265,7 +265,7 @@ jobs:
--output "type=image,push=true" \ --output "type=image,push=true" \
-t ossrs/srs:$SRS_TAG --build-arg SRS_AUTO_PACKAGER=$PACKAGER -f trunk/Dockerfile . -t ossrs/srs:$SRS_TAG --build-arg SRS_AUTO_PACKAGER=$PACKAGER -f trunk/Dockerfile .
# Docker alias images # 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 - name: Docker alias images for ossrs/srs
uses: akhilerm/tag-push-action@v2.0.0 uses: akhilerm/tag-push-action@v2.0.0
with: with:
@ -289,7 +289,7 @@ jobs:
echo "SRS_VERSION=${{ needs.envs.outputs.SRS_VERSION }}" >> $GITHUB_ENV echo "SRS_VERSION=${{ needs.envs.outputs.SRS_VERSION }}" >> $GITHUB_ENV
echo "SRS_MAJOR=${{ needs.envs.outputs.SRS_MAJOR }}" >> $GITHUB_ENV echo "SRS_MAJOR=${{ needs.envs.outputs.SRS_MAJOR }}" >> $GITHUB_ENV
# Aliyun ACR # 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 - name: Login aliyun hub
uses: docker/login-action@v1 uses: docker/login-action@v1
with: with:
@ -399,8 +399,8 @@ jobs:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 uses: actions/checkout@v3
# Create release. # Create release.
# TODO: FIXME: Refine the release when 5.0 released # TODO: FIXME: Refine the release when 6.0 released
# TODO: FIXME: Change prerelease to false when 5.0 released # TODO: FIXME: Change prerelease to false when 6.0 released
- name: Update release - name: Update release
id: update_release id: update_release
uses: ncipollo/release-action@v1 uses: ncipollo/release-action@v1

7
trunk/doc/CHANGELOG.md
View file

@ -8,9 +8,10 @@ The changelog for SRS.
## SRS 6.0 Changelog ## 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 * v6.0, 2022-12-30, Support first SRS6 version. v6.0.10
* 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 * 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
* 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-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-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-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 * v6.0, 2022-11-23, Merge [#3275](https://github.com/ossrs/srs/pull/3275): H265: Support HEVC over HTTP-TS. v6.0.4

2
trunk/src/core/srs_core_version6.hpp
View file

@ -9,6 +9,6 @@
#define VERSION_MAJOR 6 #define VERSION_MAJOR 6
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 9 #define VERSION_REVISION 10
#endif #endif