From 4a100616fc5bc60f1ac18d8637e83ea8f950dbe9 Mon Sep 17 00:00:00 2001 From: chundonglinlin Date: Wed, 1 Nov 2023 17:47:52 +0800 Subject: [PATCH] Support build without cache to test if actions fail. v5.0.196 v6.0.96 (#3858) By default, caching is enabled during compilation, which means that data is cached in Docker. This helps to avoid compiling third-party dependency libraries. However, sometimes when updating third-party libraries, it's necessary to disable caching to temporarily verify if the pipeline can succeed. Therefore, a configure option should be added. When this option is enabled, the compilation cache will not be used, and all third-party libraries will be compiled from scratch. --------- Co-authored-by: winlin --- trunk/auto/depends.sh | 2 +- trunk/auto/options.sh | 6 ++++ trunk/doc/CHANGELOG.md | 2 ++ trunk/research/players/rtc_player.html | 2 +- trunk/research/players/rtc_publisher.html | 2 +- trunk/research/players/srs_bwt.html | 2 +- trunk/research/players/srs_chat.html | 2 +- trunk/research/players/srs_gb28181.html | 2 +- trunk/research/players/srs_player.html | 34 +++++++++---------- .../players/srs_player_deprecated.html | 2 +- trunk/research/players/srs_publisher.html | 2 +- .../research/players/srs_publisher_flash.html | 2 +- trunk/research/players/vlc.html | 2 +- trunk/research/players/whep.html | 10 ++++-- trunk/research/players/whip.html | 10 ++++-- trunk/src/core/srs_core_version5.hpp | 2 +- trunk/src/core/srs_core_version6.hpp | 2 +- 17 files changed, 51 insertions(+), 35 deletions(-) diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 8c33d58395..e376fb016c 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -189,7 +189,7 @@ fi ##################################################################################### # Use srs-cache from base image. See https://github.com/ossrs/dev-docker/blob/ubuntu20-cache/Dockerfile # Note that the cache for cygwin is not under /usr/local, but copy to objs instead. -if [[ -d /usr/local/srs-cache/srs/trunk/objs && $(pwd) != "/usr/local/srs-cache/srs/trunk" ]]; then +if [[ -d /usr/local/srs-cache/srs/trunk/objs && $(pwd) != "/usr/local/srs-cache/srs/trunk" && $SRS_BUILD_CACHE == YES ]]; then SOURCE_DIR=$(ls -d /usr/local/srs-cache/srs/trunk/objs/Platform-SRS${SRS_MAJOR}-* 2>/dev/null|head -n 1) if [[ -d $SOURCE_DIR ]]; then TARGET_DIR=${SRS_OBJS}/${SRS_PLATFORM} && diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index 9d924d309c..333233a066 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -108,6 +108,8 @@ SRS_CROSS_BUILD_ARCH= SRS_CROSS_BUILD_HOST= # For cross build, the cross prefix, for example(FFmpeg), --cross-prefix=aarch64-linux-gnu- SRS_CROSS_BUILD_PREFIX= +# For cache build +SRS_BUILD_CACHE=YES # ##################################################################################### # Toolchain for cross-build on Ubuntu for ARM or MIPS. @@ -448,6 +450,10 @@ function parse_user_option() { --ffmpeg) SRS_FFMPEG_TOOL=$(switch2value $value) ;; --ffmpeg-tool) SRS_FFMPEG_TOOL=$(switch2value $value) ;; + # use cache for build. + --build-cache) SRS_BUILD_CACHE=YES ;; + --without-build-cache) SRS_BUILD_CACHE=NO ;; + *) echo "$0: error: invalid option \"$option\"" exit 1 diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 20e97cd0a6..9a96b03738 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -7,6 +7,7 @@ The changelog for SRS. ## SRS 6.0 Changelog +* v6.0, 2023-11-01, Merge [#3858](https://github.com/ossrs/srs/pull/3858): Support build without cache to test if actions fail. v6.0.96 (#3858) * v6.0, 2023-10-25, Merge [#3845](https://github.com/ossrs/srs/pull/3845): RTC: Fix FFmpeg opus audio noisy issue. v6.0.95 (#3845) * v6.0, 2023-10-21, Merge [#3847](https://github.com/ossrs/srs/pull/3847): WebRTC: TCP transport should use read_fully instead of read. v6.0.94 (#3847) * v6.0, 2023-10-20, Merge [#3846](https://github.com/ossrs/srs/pull/3846): Added system library option for ffmpeg, srtp, srt libraries. v6.0.93 (#3846) @@ -107,6 +108,7 @@ The changelog for SRS. ## SRS 5.0 Changelog +* v5.0, 2023-11-01, Merge [#3858](https://github.com/ossrs/srs/pull/3858): Support build without cache to test if actions fail. v5.0.196 (#3858) * v5.0, 2023-10-25, Merge [#3845](https://github.com/ossrs/srs/pull/3845): RTC: Fix FFmpeg opus audio noisy issue. v5.0.195 (#3845) * v5.0, 2023-10-21, Merge [#3847](https://github.com/ossrs/srs/pull/3847): WebRTC: TCP transport should use read_fully instead of read. v5.0.194 (#3847) * v5.0, 2023-10-20, Merge [#3846](https://github.com/ossrs/srs/pull/3846): Added system library option for ffmpeg, srtp, srt libraries. v5.0.193 (#3846) diff --git a/trunk/research/players/rtc_player.html b/trunk/research/players/rtc_player.html index 9ee372bb6b..5c02e3c594 100644 --- a/trunk/research/players/rtc_player.html +++ b/trunk/research/players/rtc_player.html @@ -23,7 +23,7 @@ SRS
    -
  • SRS播放器
    • +
  • LivePlayer
  • RTC播放器
  • RTC推流
  • WHIP
    • diff --git a/trunk/research/players/rtc_publisher.html b/trunk/research/players/rtc_publisher.html index 4af1fd2c21..6565954922 100644 --- a/trunk/research/players/rtc_publisher.html +++ b/trunk/research/players/rtc_publisher.html @@ -23,7 +23,7 @@ SRS
      -
    • SRS播放器
      • +
    • LivePlayer
    • RTC播放器
    • RTC推流
    • WHIP
      • diff --git a/trunk/research/players/srs_bwt.html b/trunk/research/players/srs_bwt.html index d1dfefc273..45882649e9 100644 --- a/trunk/research/players/srs_bwt.html +++ b/trunk/research/players/srs_bwt.html @@ -22,7 +22,7 @@ SRS
        -
      • SRS播放器
        • +
      • LivePlayer
      • RTC播放器
      • RTC推流
      • SRS编码器
        • diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html index a63934b737..089e602496 100644 --- a/trunk/research/players/srs_chat.html +++ b/trunk/research/players/srs_chat.html @@ -21,7 +21,7 @@ SRS
          -
        • SRS播放器
          • +
        • LivePlayer
        • RTC播放器
        • RTC推流
        • SRS编码器
          • diff --git a/trunk/research/players/srs_gb28181.html b/trunk/research/players/srs_gb28181.html index ade3d45afe..5760d6ad0a 100644 --- a/trunk/research/players/srs_gb28181.html +++ b/trunk/research/players/srs_gb28181.html @@ -35,7 +35,7 @@ SRS
            -
          • SRS播放器
            • +
          • LivePlayer
          • RTC播放器
          • RTC推流
          • iOS/Andriod
            • diff --git a/trunk/research/players/srs_player.html b/trunk/research/players/srs_player.html index 06f4d622e2..16fb1b288b 100755 --- a/trunk/research/players/srs_player.html +++ b/trunk/research/players/srs_player.html @@ -18,9 +18,9 @@ SRS
              -
            • SRS播放器
              • -
            • RTC播放器
              • -
            • RTC推流
              • +
            • LivePlayer
              • + +
            • WHIP
            • WHEP
            • iOS/Andriod
              • @@ -44,13 +44,13 @@
              - Usage: 输入HTTP-FLV/HLS地址后点击“播放视频”即可播放视频 + Usage: Enter the HTTP-FLV/HLS URL and click "Play" to start playing the video.
              URL: - +

              @@ -58,17 +58,17 @@

              - 分享：请右键拷贝此链接 + Share: Please right-click and copy this link.

              - 推荐的其他播放器： + Recommended other players:

                -
              • flv.js，H5/MSE播放HTTP-FLV
                • -
              • mpegts.js，H5/MSE播放HTTP-TS
                • -
              • hls.js，H5/MSE播放HLS
                • -
              • dash.js，H5/MSE播放MPEG-DASH
                • +
              • flv.js, HTML5/MSE for playing HTTP-FLV
                • +
              • mpegts.js, HTML5/MSE for playing HTTP-TS
                • +
              • hls.js, HTML5/MSE for playing HLS
                • +
              • dash.js, HTML5/MSE for playing MPEG-DASH

              @@ -79,14 +79,14 @@

              - Flash已死， - 无法播放RTMP流，可用ffplay或VLC播放器播放。 + Flash is dead， + Unable to play RTMP streams, you can use ffplay or VLC player to play.

                -
              • 若希望做低延迟直播（3-5秒），可用HTTP-FLV，播放器用flv.js，H5/MSE播放HTTP-FLV
                • -
              • 若希望做低延迟直播（3-5秒），可用HTTP-TS，播放器用mpegts.js，H5/MSE播放HTTP-TS
                • -
              • 若对延迟不敏感（5-10秒），跨平台比较好，可用HLS，播放器用hls.js，H5/MSE播放HLS
                • -
              • 若希望超低延迟（1秒内），只需要支持主流的浏览器，可用WebRTC，播放器用RTC播放器
                • +
              • If you want low-latency live streaming (3-5 seconds), you can use HTTP-FLV with the flv.js player for H5/MSE playback of HTTP-FLV.
                • +
              • If you want low-latency live streaming (3-5 seconds), you can use HTTP-TS with the mpegts.js player for H5/MSE playback of HTTP-TS.
                • +
              • If you are not sensitive to latency (5-10 seconds) and want better cross-platform compatibility, you can use HLS with the hls.js player for H5/MSE playback of HLS.
                • +
              • If you want ultra-low latency (within 1 second) and only need to support mainstream browsers, you can use WebRTC with the RTC player.

              更多信息，参考没有Flash如何做直播？ diff --git a/trunk/research/players/srs_player_deprecated.html b/trunk/research/players/srs_player_deprecated.html index 6f85ac7d49..4979577dec 100755 --- a/trunk/research/players/srs_player_deprecated.html +++ b/trunk/research/players/srs_player_deprecated.html @@ -32,7 +32,7 @@ SRS

                -
              • SRS播放器
                • +
              • LivePlayer
              • RTC播放器
              • RTC推流
              • iOS/Andriod
                • diff --git a/trunk/research/players/srs_publisher.html b/trunk/research/players/srs_publisher.html index af06827580..e45a34eb2f 100644 --- a/trunk/research/players/srs_publisher.html +++ b/trunk/research/players/srs_publisher.html @@ -21,7 +21,7 @@ SRS
                diff --git a/trunk/research/players/srs_publisher_flash.html b/trunk/research/players/srs_publisher_flash.html index b95c26d0d3..4ad017cfc9 100644 --- a/trunk/research/players/srs_publisher_flash.html +++ b/trunk/research/players/srs_publisher_flash.html @@ -18,7 +18,7 @@ SRS
                diff --git a/trunk/research/players/vlc.html b/trunk/research/players/vlc.html index ae2fd5ebc6..1a90575efb 100644 --- a/trunk/research/players/vlc.html +++ b/trunk/research/players/vlc.html @@ -18,7 +18,7 @@ SRS
                +
                + + Usage: Enter the WebRTC WHEP URL and click "Play" to start playing. +
                URL: diff --git a/trunk/research/players/whip.html b/trunk/research/players/whip.html index 0b61b0469a..cff306656c 100644 --- a/trunk/research/players/whip.html +++ b/trunk/research/players/whip.html @@ -23,9 +23,9 @@ SRS
                +
                + + Usage: Enter the WebRTC WHIP URL and click "Publish" to start publishing. +
                URL: diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp index 0c4fbadf9c..70ddc90e9a 100644 --- a/trunk/src/core/srs_core_version5.hpp +++ b/trunk/src/core/srs_core_version5.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 0 -#define VERSION_REVISION 195 +#define VERSION_REVISION 196 #endif diff --git a/trunk/src/core/srs_core_version6.hpp b/trunk/src/core/srs_core_version6.hpp index 1088a3217c..d7b5aca793 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 95 +#define VERSION_REVISION 96 #endif