Skip to content

Commit

Permalink
Support first SRS6 version. v6.0.10
Browse files Browse the repository at this point in the history
  • Loading branch information
winlinvip committed Dec 30, 2022
1 parent 4bc7161 commit 39c9487
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 17 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: "Release"
on:
push:
tags:
- v5*
- v6*

jobs:
envs:
Expand All @@ -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: |
Expand Down Expand Up @@ -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: |
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions trunk/doc/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/core/srs_core_version6.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

#define VERSION_MAJOR 6
#define VERSION_MINOR 0
#define VERSION_REVISION 9
#define VERSION_REVISION 10

#endif

0 comments on commit 39c9487

Please sign in to comment.