diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 252606bdd..5198ee815 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -99,6 +99,8 @@ jobs: run: | docker tag ossrs/srs:$SRS_TAG registry.cn-hangzhou.aliyuncs.com/ossrs/srs:$SRS_TAG docker push registry.cn-hangzhou.aliyuncs.com/ossrs/srs:$SRS_TAG + docker tag ossrs/srs:$SRS_TAG registry.cn-hangzhou.aliyuncs.com/ossrs/srs:$SRS_VERSION + docker push registry.cn-hangzhou.aliyuncs.com/ossrs/srs:$SRS_VERSION docker tag ossrs/srs:$SRS_TAG registry.cn-hangzhou.aliyuncs.com/ossrs/srs:v$SRS_MAJOR docker push registry.cn-hangzhou.aliyuncs.com/ossrs/srs:v$SRS_MAJOR docker tag ossrs/srs:$SRS_TAG registry.cn-hangzhou.aliyuncs.com/ossrs/srs:$SRS_MAJOR diff --git a/README.md b/README.md index 701576ee2..3bc383fd8 100755 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ [![](https://codecov.io/gh/ossrs/srs/branch/develop/graph/badge.svg)](https://codecov.io/gh/ossrs/srs/branch/develop) [![](https://gitee.com/winlinvip/srs-wiki/raw/master/images/wechat-badge4.svg)](../../wikis/Contact#wechat) [![](https://gitee.com/winlinvip/srs-wiki/raw/master/images/srs-faq.svg)](https://github.com/ossrs/srs/issues/2716) +[![](https://gitee.com/winlinvip/srs-wiki/raw/master/images/mulan-incubating.svg)](http://mulanos.cn) SRS/5.0 是一个简单高效的实时视频服务器,支持RTMP/WebRTC/HLS/HTTP-FLV/SRT。 diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf index 5d15fa750..3bb5371e6 100644 --- a/trunk/conf/full.conf +++ b/trunk/conf/full.conf @@ -113,6 +113,7 @@ tcmalloc_release_rate 0.8; # Query the latest available version of SRS, write a log to notice user to upgrade. # @see https://github.com/ossrs/srs/issues/2424 +# @see https://github.com/ossrs/srs/issues/2508 # Default: on query_latest_version on; diff --git a/trunk/src/app/srs_app_latest_version.cpp b/trunk/src/app/srs_app_latest_version.cpp index 21ffbbb0f..f1ae0e0d8 100644 --- a/trunk/src/app/srs_app_latest_version.cpp +++ b/trunk/src/app/srs_app_latest_version.cpp @@ -30,6 +30,8 @@ extern bool _srs_in_docker; #define SRS_CHECK_FEATURE2(cond, key, ss) if (cond) ss << "&" << key << "=1" #define SRS_CHECK_FEATURE3(cond, key, value, ss) if (cond) ss << "&" << key << "=" << value +// @see https://github.com/ossrs/srs/issues/2424 +// @see https://github.com/ossrs/srs/issues/2508 void srs_build_features(stringstream& ss) { if (SRS_OSX_BOOL) { @@ -38,9 +40,9 @@ void srs_build_features(stringstream& ss) ss << "&os=linux"; } -#if defined(__amd64__) && defined(__x86_64__) && defined(__i386__) +#if defined(__amd64__) || defined(__x86_64__) || defined(__i386__) ss << "&x86=1"; -#elif defined(__arm__) && defined(__aarch64__) +#elif defined(__arm__) || defined(__aarch64__) ss << "&arm=1"; #elif defined(__mips__) ss << "&mips=1"; @@ -161,6 +163,8 @@ SrsLatestVersion::~SrsLatestVersion() srs_error_t SrsLatestVersion::start() { + // @see https://github.com/ossrs/srs/issues/2424 + // @see https://github.com/ossrs/srs/issues/2508 if (!_srs_config->whether_query_latest_version()) { return srs_success; }