Skip to content

Commit 3685486

Browse files
authored
fix windows and build webrtc on older platforms (#254)
1 parent 381255a commit 3685486

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

.github/workflows/webrtc-builds.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,22 @@ jobs:
2626
matrix:
2727
target:
2828
- name: win
29-
os: windows-latest
29+
os: windows-2019
3030
cmd: .\build_windows.cmd
3131
arch: x64
3232

3333
- name: win
34-
os: windows-latest
34+
os: windows-2019
3535
cmd: .\build_windows.cmd
3636
arch: arm64
3737

3838
- name: mac
39-
os: macos-latest
39+
os: macos-11
4040
cmd: ./build_macos.sh
4141
arch: x64
4242

4343
- name: mac
44-
os: macos-latest
44+
os: macos-11
4545
cmd: ./build_macos.sh
4646
arch: arm64
4747

@@ -56,29 +56,29 @@ jobs:
5656
arch: arm64
5757

5858
- name: android
59-
os: ubuntu-latest
59+
os: ubuntu-20.04
6060
cmd: ./build_android.sh
6161
arch: arm64
6262

6363
- name: android
64-
os: ubuntu-latest
64+
os: ubuntu-20.04
6565
cmd: ./build_android.sh
6666
arch: arm
6767

6868
- name: android
69-
os: ubuntu-latest
69+
os: ubuntu-20.04
7070
cmd: ./build_android.sh
7171
arch: x64
7272

7373
- name: ios
7474
out: ios-device-arm64
75-
os: macos-latest
75+
os: macos-11
7676
cmd: ./build_ios.sh
7777
arch: arm64
7878

7979
- name: ios
8080
out: ios-simulator-arm64
81-
os: macos-latest
81+
os: macos-11
8282
cmd: ./build_ios.sh
8383
arch: arm64
8484
buildargs: --environment simulator
@@ -118,11 +118,11 @@ jobs:
118118
sudo apt install -y ninja-build pkg-config openjdk-11-jdk
119119
120120
- name: Install macos dependencies
121-
if: ${{ matrix.target.os == 'macos-latest' }}
121+
if: ${{ matrix.target.os == 'macos-11' }}
122122
run: brew install ninja
123123

124124
- name: Install windows dependencies
125-
if: ${{ matrix.target.os == 'windows-latest' }}
125+
if: ${{ matrix.target.os == 'windows-2019' }}
126126
run: |
127127
Invoke-WebRequest -Uri "https://github.com/ninja-build/ninja/releases/latest/download/ninja-win.zip" -OutFile ninja.zip
128128
Expand-Archive -Path ninja.zip -DestinationPath ${{ github.workspace }}\ninja
@@ -141,13 +141,13 @@ jobs:
141141
working-directory: webrtc-sys/libwebrtc
142142

143143
- name: Zip artifact (Unix)
144-
if: ${{ matrix.target.os != 'windows-latest' }}
144+
if: ${{ matrix.target.os != 'windows-2019' }}
145145
run: |
146146
cd webrtc-sys/libwebrtc
147147
zip ${{ github.workspace }}/${{ steps.setup.outputs.ZIP }} ${{ steps.setup.outputs.OUT }} -r
148148
149149
- name: Zip artifact (Windows)
150-
if: ${{ matrix.target.os == 'windows-latest' }}
150+
if: ${{ matrix.target.os == 'windows-2019' }}
151151
run: Compress-Archive -Path .\webrtc-sys\libwebrtc\${{ steps.setup.outputs.OUT }} -DestinationPath ${{ steps.setup.outputs.ZIP }}
152152

153153
- name: Upload artifacts

webrtc-sys/libwebrtc/build_windows.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ if "!profile!" == "debug" (
6565

6666
rem generate ninja for release
6767
call gn.bat gen %OUTPUT_DIR% --root="src" ^
68-
--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"
68+
--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"
6969

7070
rem build
7171
ninja.exe -C %OUTPUT_DIR% :default

0 commit comments

Comments
 (0)