diff --git a/.github/workflows/ccpp-linux.yml b/.github/workflows/ccpp-linux.yml index 42fbeb94..694e7b1a 100644 --- a/.github/workflows/ccpp-linux.yml +++ b/.github/workflows/ccpp-linux.yml @@ -33,7 +33,7 @@ jobs: make - name: cpack - run: cpack -B $(pwd)/artifact + run: cpack -B artifact - uses: actions/upload-artifact@v1 with: diff --git a/.github/workflows/ccpp-windows.yml b/.github/workflows/ccpp-windows.yml index 5ab35890..a944c594 100644 --- a/.github/workflows/ccpp-windows.yml +++ b/.github/workflows/ccpp-windows.yml @@ -49,3 +49,12 @@ jobs: DEPOT_TOOLS_WIN_TOOLCHAIN: 0 CLANG_VERSION: ToT PYTHONIOENCODING: UTF-8 + + - name: cpack + run: cpack -B artifact + + - uses: actions/upload-artifact@v1 + with: + name: pkg + path: artifact + diff --git a/CMakeLists.txt b/CMakeLists.txt index d720f6fd..97339d48 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,7 +61,7 @@ if (NOT EXISTS ${WEBRTCROOT}/src/out/${WEBRTCBUILD}/args.gn) # compilation mode depending on target if(CMAKE_SYSTEM_PROCESSOR MATCHES "armv6.*") - set (WEBRTCARGS target_cpu="arm"\narm_version=6\narm_float_abi="hard"\nenable_libaom_decoder=false\n${WEBRTCARGS}) + set (WEBRTCARGS target_cpu="arm"\narm_version=6\narm_float_abi="hard"\nenable_libaom=false\n${WEBRTCARGS}) set (WEBRTCARGS use_sysroot=true\n${WEBRTCARGS}) set (WEBRTCARGS is_clang=true\n${WEBRTCARGS}) elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "armv.*") diff --git a/README.md b/README.md index b2978ccd..0eb3b93d 100755 --- a/README.md +++ b/README.md @@ -12,7 +12,6 @@ [![Docker Pulls](https://img.shields.io/docker/pulls/mpromonet/webrtc-streamer.svg)](https://hub.docker.com/r/mpromonet/webrtc-streamer/) [![Heroku](https://heroku-badge.herokuapp.com/?app=webrtc-streamer)](https://webrtc-streamer.herokuapp.com/) -[![Openshift](https://img.shields.io/badge/openshift-ok-green.svg)](http://webrtc-streamer-mpromonet.7e14.starter-us-west-2.openshiftapps.com/) WebRTC-streamer ===============