1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00

Fix #2219, Ubuntu build fail. Add CI for ubuntu20

This commit is contained in:
winlin 2021-03-03 21:15:26 +08:00
parent 969b947849
commit 57f16299f4
3 changed files with 14 additions and 3 deletions

View file

@ -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

View file

@ -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.

View file

@ -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