report error when webrtc build fails

mpromonet · Jan 25, 2025 · 5bda291 · 5bda291
1 parent d79ee28
commit 5bda291
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 15 deletions.
diff --git a/.github/workflows/deploy-docker.yml b/.github/workflows/deploy-docker.yml
@@ -46,7 +46,7 @@ jobs:
         tags: ${{ steps.meta.outputs.tags }} 
 
     - name: Log in to Azure
-      uses: azure/login@v1
+      uses: azure/login@v2
       with:
         creds: ${{ secrets.AZURE_CREDENTIALS }}
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -102,16 +102,22 @@ if (NOT EXISTS ${WEBRTCOBJS}/${CMAKE_STATIC_LIBRARY_PREFIX}webrtc${CMAKE_STATIC_
     MESSAGE("CONFIGURE_ARGS = ${CONFIGURE_ARGS}")
     EXECUTE_PROCESS(WORKING_DIRECTORY ${WEBRTCROOT}/src/third_party/ffmpeg COMMAND ./configure ${CONFIGURE_ARGS})
 
-    file(COPY ${WEBRTCROOT}/src/third_party/ffmpeg/config.h DESTINATION ${WEBRTCROOT}/src/third_party/ffmpeg/chromium/config/Chrome/linux/arm/)
-    file(COPY ${WEBRTCROOT}/src/third_party/ffmpeg/config_components.h DESTINATION ${WEBRTCROOT}/src/third_party/ffmpeg/chromium/config/Chrome/linux/arm/)
-    file(COPY ${WEBRTCROOT}/src/third_party/ffmpeg/libavutil/avconfig.h DESTINATION ${WEBRTCROOT}/src/third_party/ffmpeg/chromium/config/Chrome/linux/arm/libavutil/)
-    file(COPY ${WEBRTCROOT}/src/third_party/ffmpeg/libavfilter/filter_list.c DESTINATION ${WEBRTCROOT}/src/third_party/ffmpeg/chromium/config/Chrome/linux/arm/libavutil/)
-    file(COPY ${WEBRTCROOT}/src/third_party/ffmpeg/libavcodec/codec_list.c DESTINATION ${WEBRTCROOT}/src/third_party/ffmpeg/chromium/config/Chrome/linux/arm/libavcodec/)
-    file(COPY ${WEBRTCROOT}/src/third_party/ffmpeg/libavcodec/parser_list.c DESTINATION ${WEBRTCROOT}/src/third_party/ffmpeg/chromium/config/Chrome/linux/arm/libavcodec/)
-    file(COPY ${WEBRTCROOT}/src/third_party/ffmpeg/libavcodec/bsf_list.c DESTINATION ${WEBRTCROOT}/src/third_party/ffmpeg/chromium/config/Chrome/linux/arm/libavcodec/)
-    file(COPY ${WEBRTCROOT}/src/third_party/ffmpeg/libavformat/demuxer_list.c DESTINATION ${WEBRTCROOT}/src/third_party/ffmpeg/chromium/config/Chrome/linux/arm/libavformat/)
-    file(COPY ${WEBRTCROOT}/src/third_party/ffmpeg/libavformat/muxer_list.c DESTINATION ${WEBRTCROOT}/src/third_party/ffmpeg/chromium/config/Chrome/linux/arm/libavformat/)
-    file(COPY ${WEBRTCROOT}/src/third_party/ffmpeg/libavformat/protocol_list.c DESTINATION ${WEBRTCROOT}/src/third_party/ffmpeg/chromium/config/Chrome/linux/arm/libavformat/)
+    set(FILES_TO_COPY
+        config.h
+        config_components.h
+        libavutil/avconfig.h
+        libavfilter/filter_list.c
+        libavcodec/codec_list.c
+        libavcodec/parser_list.c
+        libavcodec/bsf_list.c
+        libavformat/demuxer_list.c
+        libavformat/muxer_list.c
+        libavformat/protocol_list.c
+    )
+
+    foreach(FILE ${FILES_TO_COPY})
+        file(COPY ${WEBRTCROOT}/src/third_party/ffmpeg/${FILE} DESTINATION ${WEBRTCROOT}/src/third_party/ffmpeg/chromium/config/Chrome/linux/arm/${FILE})
+    endforeach()
   endif()
 
   #patch
@@ -169,10 +175,13 @@ if (NOT EXISTS ${WEBRTCOBJS}/${CMAKE_STATIC_LIBRARY_PREFIX}webrtc${CMAKE_STATIC_
     SET (SHELLCOMMAND cmd /c )
   endif()
   EXECUTE_PROCESS(WORKING_DIRECTORY ${WEBRTCROOT}/src/out/${CMAKE_BUILD_TYPE} COMMAND ${SHELLCOMMAND} gn gen .)  
-  SET(NINJA_TARGET webrtc rtc_json builtin_video_decoder_factory builtin_video_encoder_factory p2p_server_utils task_queue default_task_queue_factory)
-  EXECUTE_PROCESS(WORKING_DIRECTORY ${WEBRTCROOT}/src/out/${CMAKE_BUILD_TYPE} COMMAND ${SHELLCOMMAND} ninja ${NINJA_TARGET})
-endif() 
 
+  SET(NINJA_TARGET webrtc rtc_json builtin_video_decoder_factory builtin_video_encoder_factory p2p_server_utils task_queue default_task_queue_factory)
+  EXECUTE_PROCESS(WORKING_DIRECTORY ${WEBRTCROOT}/src/out/${CMAKE_BUILD_TYPE} COMMAND ${SHELLCOMMAND} ninja ${NINJA_TARGET} RESULT_VARIABLE NINJA_RESULT)
+  if(NOT NINJA_RESULT EQUAL 0)
+    message(FATAL_ERROR "webrtc build failed with exit code ${NINJA_RESULT}")
+  endif()  
+endif()
 
 # build version identifier
 if(GIT_FOUND)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -63,6 +63,6 @@
 
   apps:
     webrtc-streamer:
-      command: usr/local/webrtc-streamer/webrtc-streamer -C $SNAP/usr/local/webrtc-streamer/config.json -w $SNAP/usr/local/webrtc-streamer/html
+      command: usr/local/bin/webrtc-streamer -C $SNAP/usr/local/webrtc-streamer/config.json -w $SNAP/usr/local/webrtc-streamer/html
       daemon: simple   
       plugs: [network-bind]