From fe13825cbc7db3149e9957d80ff58507e5ed30a3 Mon Sep 17 00:00:00 2001 From: tyranron Date: Mon, 6 Nov 2023 05:33:49 +0000 Subject: [PATCH 1/5] Upgrade to 119.0.6045.105 version --- VERSION | 4 ++-- instrumentisto-libwebrtc-bin.podspec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index bc31549c..d9a6f5a2 100644 --- a/VERSION +++ b/VERSION @@ -2,10 +2,10 @@ CCACHE_VERSION=4.6 # WebRTC doesn't have its own versioning, so we use Chromium versions: # https://chromiumdash.appspot.com/releases -WEBRTC_VERSION=118.0.5993.117 +WEBRTC_VERSION=119.0.6045.105 # Look for the concrete revision for WebRTC in: # https://chromium.googlesource.com/chromium/src/+/refs/tags//DEPS -WEBRTC_COMMIT=d8f2b0380b3ec980af35ce4b92ba6a211ec8c76d +WEBRTC_COMMIT=52bc9f7c1205f4b731ea0289b059f7d240c1e228 PACKAGE_NAMES= \ linux-arm64 \ diff --git a/instrumentisto-libwebrtc-bin.podspec b/instrumentisto-libwebrtc-bin.podspec index a6256b60..f22e615f 100644 --- a/instrumentisto-libwebrtc-bin.podspec +++ b/instrumentisto-libwebrtc-bin.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = "instrumentisto-libwebrtc-bin" - spec.version = "118.0.5993.117" + spec.version = "119.0.6045.105" spec.summary = "Pre-compiled `libwebrtc` library for Darwin used by Medea Flutter-WebRTC." spec.homepage = "https://github.com/instrumentisto/libwebrtc-bin" @@ -8,7 +8,7 @@ Pod::Spec.new do |spec| spec.author = { 'Instrumentisto Team' => 'developer@instrumentisto.com' } spec.ios.deployment_target = '10.0' - spec.source = { :http => "https://github.com/instrumentisto/libwebrtc-bin/releases/download/118.0.5993.117/libwebrtc-ios.zip" } + spec.source = { :http => "https://github.com/instrumentisto/libwebrtc-bin/releases/download/119.0.6045.105/libwebrtc-ios.zip" } spec.vendored_frameworks = "WebRTC.xcframework" spec.pod_target_xcconfig = { From ee4812f5db329fd25ce188565b94f5d03dfcf6a0 Mon Sep 17 00:00:00 2001 From: rogurotus Date: Tue, 14 Nov 2023 12:09:30 +0300 Subject: [PATCH 2/5] try --- build/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/build/Makefile b/build/Makefile index 55ff51d7..f3f7f95d 100644 --- a/build/Makefile +++ b/build/Makefile @@ -76,6 +76,7 @@ $(foreach pkg, $(PACKAGE_NAMES), $(eval $(call generateRules,$(pkg)))) .PHONY: prepare prepare: mkdir -p $(THIRD_PARTY_DIR) + pip install setuptools -y .PHONY: depot_tools depot_tools: prepare From 9d6f60d646bbe29fd6c0960521a8f46987755ae5 Mon Sep 17 00:00:00 2001 From: rogurotus Date: Tue, 14 Nov 2023 12:11:59 +0300 Subject: [PATCH 3/5] retry --- build/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Makefile b/build/Makefile index f3f7f95d..5ed36b4a 100644 --- a/build/Makefile +++ b/build/Makefile @@ -76,7 +76,7 @@ $(foreach pkg, $(PACKAGE_NAMES), $(eval $(call generateRules,$(pkg)))) .PHONY: prepare prepare: mkdir -p $(THIRD_PARTY_DIR) - pip install setuptools -y + pip install setuptools .PHONY: depot_tools depot_tools: prepare From b070bce20c8b5be26fd32d68ffa7c3caafe112cb Mon Sep 17 00:00:00 2001 From: rogurotus Date: Tue, 14 Nov 2023 12:18:26 +0300 Subject: [PATCH 4/5] fix --- .github/workflows/ci.yml | 4 ++++ build/Makefile | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e7345af2..2d172b26 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,6 +46,10 @@ jobs: - run: powershell .\disk_cleanup.bat if: ${{ matrix.os == 'windows' }} + - name: Mac deps + run: pip install setuptools + if: ${{ matrix.os == 'ios' || matrix.os == 'macos' }} + - run: make -C docker ${{ matrix.os }}${{ matrix.arch != '' && format('-{0}', matrix.arch) || '' }} if: ${{ matrix.os == 'android' || matrix.os == 'linux' }} - run: make -C build USE_CCACHE=0 ${{ matrix.os }}${{ matrix.arch != '' && format('-{0}', matrix.arch) || '' }} diff --git a/build/Makefile b/build/Makefile index 5ed36b4a..55ff51d7 100644 --- a/build/Makefile +++ b/build/Makefile @@ -76,7 +76,6 @@ $(foreach pkg, $(PACKAGE_NAMES), $(eval $(call generateRules,$(pkg)))) .PHONY: prepare prepare: mkdir -p $(THIRD_PARTY_DIR) - pip install setuptools .PHONY: depot_tools depot_tools: prepare From c567628e254b82641e480894dfa2b3b0011cbee4 Mon Sep 17 00:00:00 2001 From: tyranron Date: Tue, 14 Nov 2023 17:17:31 +0100 Subject: [PATCH 5/5] Upd CI --- .github/workflows/ci.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2d172b26..33b7adee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,27 +35,26 @@ jobs: arch: x64 - os: windows arch: x64 - runs-on: ${{ ((matrix.os == 'ios' || matrix.os == 'macos') && 'macos-11') - || (matrix.os == 'windows' && 'windows-2019') - || 'ubuntu-latest' }} + runs-on: ${{ (contains('ios macos', matrix.os) && 'macos-11') + || (contains('windows', matrix.os) && 'windows-2019') + || 'ubuntu-latest' }} steps: - uses: actions/checkout@v4 - run: ./disk_cleanup.sh - if: ${{ matrix.os == 'android' || matrix.os == 'linux' }} + if: ${{ contains('android linux', matrix.os) }} - run: powershell .\disk_cleanup.bat - if: ${{ matrix.os == 'windows' }} + if: ${{ contains('windows', matrix.os) }} - - name: Mac deps - run: pip install setuptools - if: ${{ matrix.os == 'ios' || matrix.os == 'macos' }} + - run: pip install setuptools + if: ${{ contains('ios macos', matrix.os) }} - run: make -C docker ${{ matrix.os }}${{ matrix.arch != '' && format('-{0}', matrix.arch) || '' }} - if: ${{ matrix.os == 'android' || matrix.os == 'linux' }} + if: ${{ contains('android linux', matrix.os) }} - run: make -C build USE_CCACHE=0 ${{ matrix.os }}${{ matrix.arch != '' && format('-{0}', matrix.arch) || '' }} - if: ${{ matrix.os == 'ios' || matrix.os == 'macos' }} + if: ${{ contains('ios macos', matrix.os) }} - run: powershell .\build.windows.bat - if: ${{ matrix.os == 'windows' }} + if: ${{ contains('windows', matrix.os) }} - uses: actions/upload-artifact@v3 with: