From 2cd7000e1037b5f7ad5a946d12589507a4dfdcc9 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 15 Nov 2021 11:23:23 +0800 Subject: [PATCH 1/3] Refine the docker tag with 4, v4, 4.*, v4.* --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 29eb6509a..2b27bf2dc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -98,6 +98,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 From 365bf082801ecaef93c818d5af76012b554998ad Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 15 Nov 2021 14:05:50 +0800 Subject: [PATCH 2/3] Add mulan-incubating badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 21d7c77c5..dc645d217 100755 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ [![](https://codecov.io/gh/ossrs/srs/branch/4.0release/graph/badge.svg)](https://codecov.io/gh/ossrs/srs/branch/4.0release) [![](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/4.0，[Leo][release4]，是一个简单高效的实时视频服务器，支持RTMP/WebRTC/HLS/HTTP-FLV/SRT。 From f3380d2ec0bb5a7b22823b5b7faffe0c933b3be1 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 15 Nov 2021 20:33:27 +0800 Subject: [PATCH 3/3] Fix bug for CPU arch info --- trunk/conf/full.conf | 1 + trunk/src/app/srs_app_latest_version.cpp | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf index c3f092855..c889d2dc3 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 7edd1e74f..c2362e63c 100644 --- a/trunk/src/app/srs_app_latest_version.cpp +++ b/trunk/src/app/srs_app_latest_version.cpp @@ -47,6 +47,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) { @@ -55,9 +57,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"; @@ -176,6 +178,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; }