diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 4cd3cb2a2..ab0c14100 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -177,7 +177,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 845162f09..2f8c7dad3 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -107,6 +107,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. @@ -445,6 +447,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 676bd5f1d..b9cf22414 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -7,6 +7,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 9ee372bb6..5c02e3c59 100644 --- a/trunk/research/players/rtc_player.html +++ b/trunk/research/players/rtc_player.html @@ -23,7 +23,7 @@ SRS