Merge pull request #936 from ZLMediaKit/feature/fix-workflow

支持编译 WebRTC

.github/workflows/ccpp.yml

@@ -5,7 +5,7 @@ on: [push]
 jobs:
 jobs:
   build:
   build:
 
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
 
     steps:
     steps:
     - uses: actions/checkout@v1
     - uses: actions/checkout@v1
@@ -16,8 +16,19 @@ jobs:
     - name: apt-get安装依赖库(非必选)
     - name: apt-get安装依赖库(非必选)
       run: sudo apt-get update && sudo apt-get install -y cmake  libssl-dev libsdl-dev libavcodec-dev libavutil-dev
       run: sudo apt-get update && sudo apt-get install -y cmake  libssl-dev libsdl-dev libavcodec-dev libavutil-dev
 
 
+    - name: 下载 SRTP
+      uses: actions/checkout@v2
+      with:
+        repository: cisco/libsrtp
+        fetch-depth: 1
+        ref: v2.3.0
+        path: 3rdpart/libsrtp
+
+    - name: 编译 SRTP
+      run: cd 3rdpart/libsrtp && ./configure --enable-openssl && make -j4 && sudo make install
+
     - name: 编译
     - name: 编译
-      run: mkdir -p linux_build && cd linux_build && cmake .. && make -j4
+      run: mkdir -p linux_build && cd linux_build && cmake .. -DENABLE_WEBRTC:BOOL=TRUE && make -j4
 
 
     - name: 运行MediaServer
     - name: 运行MediaServer
       run: pwd && cd release/linux/Debug && sudo ./MediaServer -d &
       run: pwd && cd release/linux/Debug && sudo ./MediaServer -d &

tests/CMakeLists.txt

@@ -55,6 +55,12 @@ else()
 endif()
 endif()
 
 
 foreach(TEST_SRC ${TEST_SRC_LIST})
 foreach(TEST_SRC ${TEST_SRC_LIST})
+    if(NOT ENABLE_WEBRTC)
+        # 暂时过滤掉依赖 WebRTC 的测试模块
+        if("${TEST_SRC}" MATCHES "test_rtcp_nack\.cpp")
+            continue()
+        endif()
+    endif()
     STRING(REGEX REPLACE "^\\./|\\.c[a-zA-Z0-9_]*$" "" TEST_EXE_NAME ${TEST_SRC})
     STRING(REGEX REPLACE "^\\./|\\.c[a-zA-Z0-9_]*$" "" TEST_EXE_NAME ${TEST_SRC})
     message(STATUS "add test:${TEST_EXE_NAME}")
     message(STATUS "add test:${TEST_EXE_NAME}")
     add_executable(${TEST_EXE_NAME} ${TEST_SRC})
     add_executable(${TEST_EXE_NAME} ${TEST_SRC})