diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2b27bf2dc5..3467665685 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,6 +21,7 @@ jobs: # SRS_TAG=v4.0-r8 # SRS_TAG=v4.0.145 # SRS_VERSION=4.0.145 + # SRS_VERSION=4.0-r8 # SRS_MAJOR=4 # @see https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable - name: Generate varaiables diff --git a/README.md b/README.md index 714fc6cd89..0e14451e95 100755 --- a/README.md +++ b/README.md @@ -107,6 +107,7 @@ A big THANK YOU goes to: ## Releases +* 2021-12-01, Release [v4.0-b0][https://github.com/ossrs/srs/releases/tag/v4.0-b0], v4.0-b0, 4.0 beta0, v4.0.201, 144022 lines. * 2021-11-15, Release [v4.0.198](https://github.com/ossrs/srs/releases/tag/v4.0.198), 4.0 dev8, v4.0.198, 144010 lines. * 2021-11-02, Release [v4.0.191](https://github.com/ossrs/srs/releases/tag/v4.0.191), 4.0 dev7, v4.0.191, 143890 lines. * 2021-10-12, Release [v4.0.177](https://github.com/ossrs/srs/releases/tag/v4.0.177), 4.0 dev6, v4.0.177, 143686 lines. diff --git a/trunk/Dockerfile.pkg b/trunk/Dockerfile.pkg index e6b74172d8..ade5778cde 100644 --- a/trunk/Dockerfile.pkg +++ b/trunk/Dockerfile.pkg @@ -12,5 +12,5 @@ ENV SRS_AUTO_PACKAGER ossrs # Build and install SRS. ADD srs-server-${version}.tar.gz /srs WORKDIR /srs/srs-server-${version}/trunk -RUN ./scripts/package.sh --x86-x64 --jobs=2 +RUN ./scripts/package.sh --x86-x64 --jobs=2 --tag=${version} diff --git a/trunk/scripts/package.sh b/trunk/scripts/package.sh index 3768b54bab..7e3c19ed90 100755 --- a/trunk/scripts/package.sh +++ b/trunk/scripts/package.sh @@ -17,6 +17,8 @@ MIPS=NO # EMBEDED=NO JOBS=1 +# +SRS_TAG= ################################################################################## ################################################################################## @@ -27,12 +29,13 @@ do case "$option" in -*=*) value=`echo "$option" | sed -e 's|[-_a-zA-Z0-9/]*=||'` - option=`echo "$option" | sed -e 's|=[-_a-zA-Z0-9/~]*||'` + option=`echo "$option" | awk -F '=' '{print $1}'` ;; *) value="" ;; esac case "$option" in + -h) help=yes ;; --help) help=yes ;; --x86-x64) X86_X64=YES ;; @@ -41,6 +44,7 @@ do --arm) ARM=YES ;; --pi) PI=YES ;; --jobs) JOBS=$value ;; + --tag) SRS_TAG=$value ;; *) echo "$0: error: invalid option \"$option\", @see $0 --help" @@ -51,14 +55,15 @@ done if [ $help = yes ]; then cat << END - --help print this message + --help Print this message - --x86-x64 for x86-x64 platform, configure/make/package. - --arm for arm cross-build platform, configure/make/package. - --mips for mips cross-build platform, configure/make/package. - --pi for pi platform, configure/make/package. - --x86-64 alias for --x86-x64. + --x86-x64 For x86-x64 platform, configure/make/package. + --x86-64 Alias for --x86-x64. + --arm For arm cross-build platform, configure/make/package. + --mips For mips cross-build platform, configure/make/package. + --pi For pi platform, configure/make/package. --jobs Set the configure and make jobs. + --tag Set the version in zip file. END exit 0 fi @@ -116,7 +121,7 @@ ok_msg "real os is ${os_name}-${os_major_version} ${os_release} ${os_machine}" # build srs # @see https://github.com/ossrs/srs/wiki/v1_CN_Build -ok_msg "start build srs, ARM: $ARM, MIPS: $MIPS, PI: $PI, X86_64: $X86_X64, JOBS: $JOBS" +ok_msg "start build srs, ARM: $ARM, MIPS: $MIPS, PI: $PI, X86_64: $X86_X64, JOBS: $JOBS, TAG: $SRS_TAG" if [ $ARM = YES ]; then ( cd $work_dir && @@ -174,15 +179,18 @@ fi ok_msg "machine: $os_machine" # generate zip dir and zip filename -if [ $EMBEDED = YES ]; then - srs_version_major=`cat $work_dir/src/core/srs_core.hpp| grep '#define VERSION_MAJOR'| awk '{print $3}'|xargs echo` && - srs_version_minor=`cat $work_dir/src/core/srs_core.hpp| grep '#define VERSION_MINOR'| awk '{print $3}'|xargs echo` && - srs_version_revision=`cat $work_dir/src/core/srs_core.hpp| grep '#define VERSION_REVISION'| awk '{print $3}'|xargs echo` && - srs_version=$srs_version_major.$srs_version_minor.$srs_version_revision -else - srs_version=`${build_objs}/srs -v 2>/dev/stdout 1>/dev/null` +srs_version=$SRS_TAG +if [[ $srs_version == '' ]]; then + if [ $EMBEDED = YES ]; then + srs_version_major=`cat $work_dir/src/core/srs_core.hpp| grep '#define VERSION_MAJOR'| awk '{print $3}'|xargs echo` && + srs_version_minor=`cat $work_dir/src/core/srs_core.hpp| grep '#define VERSION_MINOR'| awk '{print $3}'|xargs echo` && + srs_version_revision=`cat $work_dir/src/core/srs_core.hpp| grep '#define VERSION_REVISION'| awk '{print $3}'|xargs echo` && + srs_version=$srs_version_major.$srs_version_minor.$srs_version_revision + else + srs_version=`${build_objs}/srs -v 2>/dev/stdout 1>/dev/null` + fi + ret=$?; if [[ 0 -ne ${ret} ]]; then failed_msg "get srs version failed"; exit $ret; fi fi -ret=$?; if [[ 0 -ne ${ret} ]]; then failed_msg "get srs version failed"; exit $ret; fi ok_msg "get srs version $srs_version" zip_dir="SRS-${os_name}${os_major_version}-${os_machine}-${srs_version}" diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index 7688573949..fccc7f189b 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 4 #define VERSION_MINOR 0 -#define VERSION_REVISION 200 +#define VERSION_REVISION 201 #endif