Upgrade to 126.0.6478.182-r1 version (#111)

- support additional `REVISION` number for versioning

Co-authored-by: Kai Ren <[email protected]>

.github/workflows/ci.yml

@@ -221,8 +221,7 @@ jobs:
       - name: Verify release version matches VERSION file
         run: |
           test "${{ steps.release.outputs.version }}" \
-            == "$(grep 'WEBRTC_VERSION=' VERSION | cut -d '=' -f2 | tr -d '\n')"
-        if: ${{ !contains(steps.release.outputs.version, '-') }}
+            == "$(grep 'WEBRTC_VERSION=' VERSION | cut -d '=' -f2 | tr -d '\n')$(grep -e '^REVISION=.*$' VERSION | cut -d '=' -f2 | sed -e 's/^/-r/' | tr -d '\n')"
 
       - uses: actions/download-artifact@v4
         with:
@@ -270,4 +269,3 @@ jobs:
             package/libwebrtc-*.zip
             package/libwebrtc-*.zip.sha256sum
           fail_on_unmatched_files: true
-          prerelease: ${{ contains(steps.release.outputs.version, '-') }}

VERSION

@@ -7,6 +7,13 @@ WEBRTC_VERSION=126.0.6478.182
 # https://chromium.googlesource.com/chromium/src/+/refs/tags/<WEBRTC_VERSION>/DEPS
 WEBRTC_COMMIT=a18e38fed2307edd6382760213fa3ddf199fa181
 
+# Additional revision of the `WEBRTC_VERSION` added as `-rN` suffix to it, and
+# tracking additional changes applied on top of it.
+# Required for being able to release new versions without waiting for the
+# `WEBRTC_VERSION` bump. If absent or is commented out, then no `REVISION` is
+# added to the `WEBRTC_VERSION`.
+REVISION=1
+
 PACKAGE_NAMES= \
   linux-arm64 \
   linux-x64 \

instrumentisto-libwebrtc-bin.podspec

@@ -1,14 +1,14 @@
 Pod::Spec.new do |spec|
   spec.name = "instrumentisto-libwebrtc-bin"
-  spec.version = "126.0.6478.182"
+  spec.version = "126.0.6478.182-r1"
   spec.summary = "Pre-compiled `libwebrtc` library for Darwin used by Medea Flutter-WebRTC."
 
   spec.homepage = "https://github.com/instrumentisto/libwebrtc-bin"
   spec.license = { :type => 'BSD', :file => 'WebRTC.xcframework/LICENSE.md' }
   spec.author = { 'Instrumentisto Team' => '[email protected]' }
   spec.ios.deployment_target = '10.0'
 
-  spec.source = { :http => "https://github.com/instrumentisto/libwebrtc-bin/releases/download/126.0.6478.182/libwebrtc-ios.zip" }
+  spec.source = { :http => "https://github.com/instrumentisto/libwebrtc-bin/releases/download/126.0.6478.182-r1/libwebrtc-ios.zip" }
   spec.vendored_frameworks = "WebRTC.xcframework"
 
   spec.pod_target_xcconfig = {

upgrade-ver.sh

@@ -19,14 +19,22 @@ fi
 sed -i.bk -e "s/^WEBRTC_VERSION=.*$/WEBRTC_VERSION=$newVersion/g" \
           -e "s/^WEBRTC_COMMIT=.*$/WEBRTC_COMMIT=$newCommit/g" \
     ./VERSION
-sed -i.bk -e "s/spec\.version =.*$/spec.version = \"$newVersion\"/g" \
-          -e "s/\/download\/.*\//\/download\/$newVersion\//g" \
+
+if ! cmp -s ./VERSION ./VERSION.bk; then
+  sed -i.bk -e "s/^REVISION=/#REVISION=/g" \
+      ./VERSION
+fi
+revision=$(grep -e '^REVISION=.*$' ./VERSION | cut -d '=' -f2 \
+                                             | sed -e 's/^/-r/')
+
+sed -i.bk -e "s/spec\.version =.*$/spec.version = \"$newVersion$revision\"/g" \
+          -e "s/\/download\/.*\//\/download\/$newVersion$revision\//g" \
     ./instrumentisto-libwebrtc-bin.podspec
 
-echo "version=$newVersion"
+echo "version=$newVersion$revision"
 echo "commit=$newCommit"
 
 if [ ! -z "$GITHUB_OUTPUT" ]; then
-  echo "version=$newVersion" >> $GITHUB_OUTPUT
+  echo "version=$newVersion$revision" >> $GITHUB_OUTPUT
   echo "commit=$newCommit" >> $GITHUB_OUTPUT
 fi