diff --git a/.circleci/config.yml b/.circleci/config.yml index d62fc838d..1bd67557b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ version: 2 jobs: - build: + build-centos7: docker: - image: ossrs/srs:dev steps: @@ -9,6 +9,15 @@ jobs: cd trunk && ./configure --gb28181=off --utest=off --srtp-nasm=off && make && ./configure --gb28181=on --utest=on --srtp-nasm=on && make clean && make + build-ubuntu20: + docker: + - image: ossrs/srs:ubuntu20 + steps: + - checkout + - run: | + cd trunk && + ./configure --gb28181=off --utest=off --srtp-nasm=off && make && + ./configure --gb28181=on --utest=on --srtp-nasm=on && make clean && make test: docker: - image: ossrs/srs:dev @@ -22,5 +31,6 @@ workflows: version: 2 build_and_test: jobs: - - build + - build-centos7 + - build-ubuntu20 - test diff --git a/trunk/auto/setup_variables.sh b/trunk/auto/setup_variables.sh index cf26ea0c3..1a1bcb4d1 100755 --- a/trunk/auto/setup_variables.sh +++ b/trunk/auto/setup_variables.sh @@ -13,6 +13,7 @@ if [[ $OS_KERNEL_NAME == Darwin ]]; then SRS_PLATFORM="${SRS_PLATFORM}-${GCC_VERSION}" else GCC_VERSION="GCC$(gcc --version 2>/dev/null|grep gcc|awk '{print $3}')" + echo $GCC_VERSION| grep '-' >/dev/null && GCC_VERSION=$(echo $GCC_VERSION| awk -F '-' '{print$1}') SRS_PLATFORM="${SRS_PLATFORM}-${GCC_VERSION}" fi # Use isolate cache for different SRS version. diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index 05bc29894..11c87cb3a 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -24,6 +24,6 @@ #ifndef SRS_CORE_VERSION4_HPP #define SRS_CORE_VERSION4_HPP -#define SRS_VERSION4_REVISION 76 +#define SRS_VERSION4_REVISION 77 #endif