Skip to content

Commit

Permalink
fix windows and build webrtc on older platforms (#254)
Browse files Browse the repository at this point in the history
  • Loading branch information
theomonnom authored Nov 29, 2023
1 parent 381255a commit 3685486
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/webrtc-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion webrtc-sys/libwebrtc/build_windows.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3685486

Please sign in to comment.