diff --git a/.github/workflows/webrtc-builds.yml b/.github/workflows/webrtc-builds.yml index 0e2472b7..98ab4bbc 100644 --- a/.github/workflows/webrtc-builds.yml +++ b/.github/workflows/webrtc-builds.yml @@ -26,22 +26,22 @@ jobs: matrix: target: - name: win - os: windows-latest + os: windows-2019 cmd: .\build_windows.cmd arch: x64 - name: win - os: windows-latest + os: windows-2019 cmd: .\build_windows.cmd arch: arm64 - name: mac - os: macos-latest + os: macos-11 cmd: ./build_macos.sh arch: x64 - name: mac - os: macos-latest + os: macos-11 cmd: ./build_macos.sh arch: arm64 @@ -56,29 +56,29 @@ jobs: arch: arm64 - name: android - os: ubuntu-latest + os: ubuntu-20.04 cmd: ./build_android.sh arch: arm64 - name: android - os: ubuntu-latest + os: ubuntu-20.04 cmd: ./build_android.sh arch: arm - name: android - os: ubuntu-latest + os: ubuntu-20.04 cmd: ./build_android.sh arch: x64 - name: ios out: ios-device-arm64 - os: macos-latest + os: macos-11 cmd: ./build_ios.sh arch: arm64 - name: ios out: ios-simulator-arm64 - os: macos-latest + os: macos-11 cmd: ./build_ios.sh arch: arm64 buildargs: --environment simulator @@ -118,11 +118,11 @@ jobs: sudo apt install -y ninja-build pkg-config openjdk-11-jdk - name: Install macos dependencies - if: ${{ matrix.target.os == 'macos-latest' }} + if: ${{ matrix.target.os == 'macos-11' }} run: brew install ninja - name: Install windows dependencies - if: ${{ matrix.target.os == 'windows-latest' }} + if: ${{ matrix.target.os == 'windows-2019' }} run: | Invoke-WebRequest -Uri "https://github.com/ninja-build/ninja/releases/latest/download/ninja-win.zip" -OutFile ninja.zip Expand-Archive -Path ninja.zip -DestinationPath ${{ github.workspace }}\ninja @@ -141,13 +141,13 @@ jobs: working-directory: webrtc-sys/libwebrtc - name: Zip artifact (Unix) - if: ${{ matrix.target.os != 'windows-latest' }} + if: ${{ matrix.target.os != 'windows-2019' }} run: | cd webrtc-sys/libwebrtc zip ${{ github.workspace }}/${{ steps.setup.outputs.ZIP }} ${{ steps.setup.outputs.OUT }} -r - name: Zip artifact (Windows) - if: ${{ matrix.target.os == 'windows-latest' }} + if: ${{ matrix.target.os == 'windows-2019' }} run: Compress-Archive -Path .\webrtc-sys\libwebrtc\${{ steps.setup.outputs.OUT }} -DestinationPath ${{ steps.setup.outputs.ZIP }} - name: Upload artifacts diff --git a/webrtc-sys/libwebrtc/build_windows.cmd b/webrtc-sys/libwebrtc/build_windows.cmd index 267f8f8d..77bf8925 100644 --- a/webrtc-sys/libwebrtc/build_windows.cmd +++ b/webrtc-sys/libwebrtc/build_windows.cmd @@ -65,7 +65,7 @@ if "!profile!" == "debug" ( rem generate ninja for release call gn.bat gen %OUTPUT_DIR% --root="src" ^ - --args="is_debug=!debug! is_clang=true target_cpu=\"!arch!\" use_custom_libcxx=false rtc_include_tests=false rtc_build_examples=false rtc_build_tools=false is_component_build=false rtc_enable_protobuf=false rtc_use_h264=true ffmpeg_branding=\"Chrome\" symbol_level=0 enable_iterator_debugging=false" + --args="is_debug=!debug! is_clang=true target_cpu=\"!arch!\" use_custom_libcxx=false rtc_disable_check_msg=true rtc_include_tests=false rtc_build_examples=false rtc_build_tools=false is_component_build=false rtc_enable_protobuf=false rtc_use_h264=true ffmpeg_branding=\"Chrome\" symbol_level=0 enable_iterator_debugging=false" rem build ninja.exe -C %OUTPUT_DIR% :default