From 2d702f170d056622c93f0f4caa06e10c8e0f5129 Mon Sep 17 00:00:00 2001 From: tyranron <7114909+tyranron@users.noreply.github.com> Date: Mon, 2 Sep 2024 05:36:37 +0000 Subject: [PATCH 01/10] Upgrade to 128.0.6613.113 version --- VERSION | 4 ++-- instrumentisto-libwebrtc-bin.podspec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 8edf82e0..d6a641be 100644 --- a/VERSION +++ b/VERSION @@ -2,10 +2,10 @@ CCACHE_VERSION=4.8.3 # WebRTC doesn't have its own versioning, so we use Chromium versions: # https://chromiumdash.appspot.com/releases -WEBRTC_VERSION=128.0.6613.84 +WEBRTC_VERSION=128.0.6613.113 # Look for the concrete revision for WebRTC in: # https://chromium.googlesource.com/chromium/src/+/refs/tags//DEPS -WEBRTC_COMMIT=e7686023a186ac233ed1284da45cc166c0df4e1a +WEBRTC_COMMIT=f237dc146debcfde3d70038c2b66f71bfea8d24b # Additional revision of the `WEBRTC_VERSION` added as `-rN` suffix to it, and # tracking additional changes applied on top of it. diff --git a/instrumentisto-libwebrtc-bin.podspec b/instrumentisto-libwebrtc-bin.podspec index 2303901b..5165d802 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 = "128.0.6613.84" + spec.version = "128.0.6613.113" 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/128.0.6613.84/libwebrtc-ios.zip" } + spec.source = { :http => "https://github.com/instrumentisto/libwebrtc-bin/releases/download/128.0.6613.113/libwebrtc-ios.zip" } spec.vendored_frameworks = "WebRTC.xcframework" spec.pod_target_xcconfig = { From 016b84188db02b3f38ea9551b4c96b78481e21d4 Mon Sep 17 00:00:00 2001 From: evdokimovs Date: Tue, 3 Sep 2024 10:45:59 +0200 Subject: [PATCH 02/10] refactor: add step logging in WebRTC fetching --- scripts/fetch_webrtc.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/fetch_webrtc.sh b/scripts/fetch_webrtc.sh index 405128ed..bce5c123 100755 --- a/scripts/fetch_webrtc.sh +++ b/scripts/fetch_webrtc.sh @@ -37,8 +37,13 @@ else rm -f "$DEPOT_TOOLS_DIR/metrics.cfg" rm -rf "$WEBRTC_DIR/src" fetch --nohooks "$FETCH_TARGET" + echo "WebRTC fetched" fi +echo "Fetching with a git fetch..." cd "$WEBRTC_DIR/src/" git fetch +echo "Fetched!" git checkout -f "$WEBRTC_COMMIT" +echo "Sync with gclient" yes | gclient sync -D +echo "Synced" From 45f3630ce5864af7fd83df45c30c97c41ff94f40 Mon Sep 17 00:00:00 2001 From: evdokimovs Date: Tue, 3 Sep 2024 10:48:37 +0200 Subject: [PATCH 03/10] ci: try with a `--no-history` flag --- scripts/fetch_webrtc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/fetch_webrtc.sh b/scripts/fetch_webrtc.sh index bce5c123..cb7ecacd 100755 --- a/scripts/fetch_webrtc.sh +++ b/scripts/fetch_webrtc.sh @@ -45,5 +45,5 @@ git fetch echo "Fetched!" git checkout -f "$WEBRTC_COMMIT" echo "Sync with gclient" -yes | gclient sync -D +yes | gclient sync --no-history -D echo "Synced" From 82da00f50a6caf909eb05c5b9917425e738570cd Mon Sep 17 00:00:00 2001 From: evdokimovs Date: Tue, 3 Sep 2024 11:05:53 +0200 Subject: [PATCH 04/10] ci: add cleanup for MacOS --- .github/workflows/ci.yml | 2 ++ disk_cleanup_mac.sh | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100755 disk_cleanup_mac.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d74304b..6f667f79 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,6 +57,8 @@ jobs: - run: ./disk_cleanup.sh if: ${{ contains('android linux', matrix.os) }} + - run: ./disk_cleanup_mac.sh + if: ${{ contains('macos ios', matrix.os) }} - run: powershell .\disk_cleanup.bat if: ${{ contains('windows', matrix.os) }} diff --git a/disk_cleanup_mac.sh b/disk_cleanup_mac.sh new file mode 100755 index 00000000..68e51350 --- /dev/null +++ b/disk_cleanup_mac.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +df -h + +# Cache 済み Docker Image の削除 +docker rmi $(docker images -q -a) +sudo docker image prune --all --force + +# # ghcup の削除 +# sudo rm -rf /usr/local/.ghcup +# +# # Swift の削除 +# sudo rm -rf /usr/share/swift +# +# # Boost の削除 +# sudo rm -rf /usr/local/share/boost +# +# # .Net Core の削除 +# sudo rm -rf /usr/share/dotnet +# +# # Haskell の削除 +# sudo rm -rf /opt/ghc + +# Android SDK の削除 +sudo rm -rf /usr/local/share/android-sdk + +df -h From 5d9eb0ef6f7b58601d18f64771ca60922f1cc3a5 Mon Sep 17 00:00:00 2001 From: evdokimovs Date: Tue, 3 Sep 2024 11:14:24 +0200 Subject: [PATCH 05/10] ci: improve cleanup script --- disk_cleanup_mac.sh | 69 ++++++++++++++++++++++++++++++++------------- 1 file changed, 49 insertions(+), 20 deletions(-) diff --git a/disk_cleanup_mac.sh b/disk_cleanup_mac.sh index 68e51350..53fff0ae 100755 --- a/disk_cleanup_mac.sh +++ b/disk_cleanup_mac.sh @@ -1,27 +1,56 @@ #!/bin/bash +# Display disk usage before cleanup df -h -# Cache 済み Docker Image の削除 +# Removing cached Docker images docker rmi $(docker images -q -a) -sudo docker image prune --all --force - -# # ghcup の削除 -# sudo rm -rf /usr/local/.ghcup -# -# # Swift の削除 -# sudo rm -rf /usr/share/swift -# -# # Boost の削除 -# sudo rm -rf /usr/local/share/boost -# -# # .Net Core の削除 -# sudo rm -rf /usr/share/dotnet -# -# # Haskell の削除 -# sudo rm -rf /opt/ghc - -# Android SDK の削除 -sudo rm -rf /usr/local/share/android-sdk +docker image prune --all --force +# Remove Homebrew cache +brew cleanup -s +brew autoremove -s +rm -rf $(brew --cache) + +# Remove unused Xcode versions and simulators +sudo rm -rf /Applications/Xcode* +sudo rm -rf ~/Library/Developer/Xcode/DerivedData/* +sudo rm -rf ~/Library/Caches/com.apple.dt.Xcode +sudo rm -rf ~/Library/Developer/Xcode/iOS\ DeviceSupport/* +sudo rm -rf ~/Library/Developer/CoreSimulator/Caches/* +sudo rm -rf ~/Library/Developer/CoreSimulator/Devices/* + +# Remove .NET SDK and runtimes +sudo rm -rf /usr/local/share/dotnet +sudo rm -rf ~/.dotnet + +# Remove Haskell (GHC) +sudo rm -rf ~/.ghcup +sudo rm -rf /opt/ghc + +# Remove Swift +sudo rm -rf /usr/share/swift + +# Remove Android SDK +sudo rm -rf ~/Library/Android/sdk + +# Remove Python environments and pip cache +sudo rm -rf ~/.pyenv +sudo rm -rf ~/Library/Caches/pip + +# Remove Node.js and npm cache +sudo rm -rf ~/.npm +sudo rm -rf ~/.node-gyp +sudo rm -rf ~/.nvm + +# Remove Ruby gems and cache +sudo rm -rf ~/.gem +sudo rm -rf ~/.rbenv + +# Remove temporary files +sudo rm -rf /tmp/* +sudo rm -rf /private/var/tmp/* +sudo rm -rf /var/folders/* + +# Display disk usage after cleanup df -h From ccd453f8cd4f86f4921f7a8ba4e96dc23c74d049 Mon Sep 17 00:00:00 2001 From: evdokimovs Date: Tue, 3 Sep 2024 11:16:56 +0200 Subject: [PATCH 06/10] ci: fix cleanup script --- disk_cleanup_mac.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/disk_cleanup_mac.sh b/disk_cleanup_mac.sh index 53fff0ae..5a5aff0d 100755 --- a/disk_cleanup_mac.sh +++ b/disk_cleanup_mac.sh @@ -7,9 +7,9 @@ df -h docker rmi $(docker images -q -a) docker image prune --all --force -# Remove Homebrew cache -brew cleanup -s -brew autoremove -s +# Remove Homebrew cache and unused packages +brew cleanup +brew autoremove rm -rf $(brew --cache) # Remove unused Xcode versions and simulators From 1da47f53903525f0c3d8956c7e5e6ea5c80604d3 Mon Sep 17 00:00:00 2001 From: evdokimovs Date: Tue, 3 Sep 2024 11:42:56 +0200 Subject: [PATCH 07/10] ci: remove `--no-history` --- scripts/fetch_webrtc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/fetch_webrtc.sh b/scripts/fetch_webrtc.sh index cb7ecacd..bce5c123 100755 --- a/scripts/fetch_webrtc.sh +++ b/scripts/fetch_webrtc.sh @@ -45,5 +45,5 @@ git fetch echo "Fetched!" git checkout -f "$WEBRTC_COMMIT" echo "Sync with gclient" -yes | gclient sync --no-history -D +yes | gclient sync -D echo "Synced" From 175459a0eb72d78cf75452c929c89ea6fa857dc0 Mon Sep 17 00:00:00 2001 From: evdokimovs Date: Tue, 3 Sep 2024 12:09:50 +0200 Subject: [PATCH 08/10] ci: comment out XCode cleanup --- disk_cleanup_mac.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/disk_cleanup_mac.sh b/disk_cleanup_mac.sh index 5a5aff0d..fab5d829 100755 --- a/disk_cleanup_mac.sh +++ b/disk_cleanup_mac.sh @@ -13,9 +13,9 @@ brew autoremove rm -rf $(brew --cache) # Remove unused Xcode versions and simulators -sudo rm -rf /Applications/Xcode* -sudo rm -rf ~/Library/Developer/Xcode/DerivedData/* -sudo rm -rf ~/Library/Caches/com.apple.dt.Xcode +# sudo rm -rf /Applications/Xcode* +# sudo rm -rf ~/Library/Developer/Xcode/DerivedData/* +# sudo rm -rf ~/Library/Caches/com.apple.dt.Xcode sudo rm -rf ~/Library/Developer/Xcode/iOS\ DeviceSupport/* sudo rm -rf ~/Library/Developer/CoreSimulator/Caches/* sudo rm -rf ~/Library/Developer/CoreSimulator/Devices/* From bf038d9e738cd60c3c2713149741b3f68cfc6e6c Mon Sep 17 00:00:00 2001 From: evdokimovs Date: Tue, 3 Sep 2024 13:59:22 +0200 Subject: [PATCH 09/10] refactor --- disk_cleanup_mac.sh | 9 +-------- scripts/fetch_webrtc.sh | 5 ----- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/disk_cleanup_mac.sh b/disk_cleanup_mac.sh index fab5d829..fbc84c5b 100755 --- a/disk_cleanup_mac.sh +++ b/disk_cleanup_mac.sh @@ -3,19 +3,12 @@ # Display disk usage before cleanup df -h -# Removing cached Docker images -docker rmi $(docker images -q -a) -docker image prune --all --force - # Remove Homebrew cache and unused packages brew cleanup brew autoremove rm -rf $(brew --cache) -# Remove unused Xcode versions and simulators -# sudo rm -rf /Applications/Xcode* -# sudo rm -rf ~/Library/Developer/Xcode/DerivedData/* -# sudo rm -rf ~/Library/Caches/com.apple.dt.Xcode +# Remove XCode simulators sudo rm -rf ~/Library/Developer/Xcode/iOS\ DeviceSupport/* sudo rm -rf ~/Library/Developer/CoreSimulator/Caches/* sudo rm -rf ~/Library/Developer/CoreSimulator/Devices/* diff --git a/scripts/fetch_webrtc.sh b/scripts/fetch_webrtc.sh index bce5c123..405128ed 100755 --- a/scripts/fetch_webrtc.sh +++ b/scripts/fetch_webrtc.sh @@ -37,13 +37,8 @@ else rm -f "$DEPOT_TOOLS_DIR/metrics.cfg" rm -rf "$WEBRTC_DIR/src" fetch --nohooks "$FETCH_TARGET" - echo "WebRTC fetched" fi -echo "Fetching with a git fetch..." cd "$WEBRTC_DIR/src/" git fetch -echo "Fetched!" git checkout -f "$WEBRTC_COMMIT" -echo "Sync with gclient" yes | gclient sync -D -echo "Synced" From e6e656c94715e84a9650dd591b80ddd3db0f698a Mon Sep 17 00:00:00 2001 From: tyranron Date: Tue, 3 Sep 2024 16:35:45 +0300 Subject: [PATCH 10/10] Bikeshed --- .github/workflows/ci.yml | 4 ++-- disk_cleanup_mac.sh => disk_cleanup.mac.sh | 22 ++++++++++------------ 2 files changed, 12 insertions(+), 14 deletions(-) rename disk_cleanup_mac.sh => disk_cleanup.mac.sh (64%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f667f79..be984596 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,8 +57,8 @@ jobs: - run: ./disk_cleanup.sh if: ${{ contains('android linux', matrix.os) }} - - run: ./disk_cleanup_mac.sh - if: ${{ contains('macos ios', matrix.os) }} + - run: ./disk_cleanup.mac.sh + if: ${{ contains('ios macos', matrix.os) }} - run: powershell .\disk_cleanup.bat if: ${{ contains('windows', matrix.os) }} diff --git a/disk_cleanup_mac.sh b/disk_cleanup.mac.sh similarity index 64% rename from disk_cleanup_mac.sh rename to disk_cleanup.mac.sh index fbc84c5b..00b9dff0 100755 --- a/disk_cleanup_mac.sh +++ b/disk_cleanup.mac.sh @@ -1,49 +1,47 @@ #!/bin/bash -# Display disk usage before cleanup df -h -# Remove Homebrew cache and unused packages +# Homebrew cache and unused packages brew cleanup brew autoremove rm -rf $(brew --cache) -# Remove XCode simulators +# XCode simulators sudo rm -rf ~/Library/Developer/Xcode/iOS\ DeviceSupport/* sudo rm -rf ~/Library/Developer/CoreSimulator/Caches/* sudo rm -rf ~/Library/Developer/CoreSimulator/Devices/* -# Remove .NET SDK and runtimes +# .NET SDK and runtimes sudo rm -rf /usr/local/share/dotnet sudo rm -rf ~/.dotnet -# Remove Haskell (GHC) +# Haskell (GHC) sudo rm -rf ~/.ghcup sudo rm -rf /opt/ghc -# Remove Swift +# Swift sudo rm -rf /usr/share/swift -# Remove Android SDK +# Android SDK sudo rm -rf ~/Library/Android/sdk -# Remove Python environments and pip cache +# Python environments and pip cache sudo rm -rf ~/.pyenv sudo rm -rf ~/Library/Caches/pip -# Remove Node.js and npm cache +# Node.js and NPM cache sudo rm -rf ~/.npm sudo rm -rf ~/.node-gyp sudo rm -rf ~/.nvm -# Remove Ruby gems and cache +# Ruby gems and cache sudo rm -rf ~/.gem sudo rm -rf ~/.rbenv -# Remove temporary files +# Temporary files sudo rm -rf /tmp/* sudo rm -rf /private/var/tmp/* sudo rm -rf /var/folders/* -# Display disk usage after cleanup df -h