Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .depot/workflows/build-apk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
MDVPN_COMMIT: d481d72d4b86783a87d536c214d2c68cc4e9320e
NAIVE_VERSION: v149.0.7827.114-1
OLCRTC_REPO: https://github.com/openlibrecommunity/olcrtc.git
OLCRTC_COMMIT: 58df8899c1a12cab22282448d2e7fc25e175822b
OLCRTC_COMMIT: 42ae4e0c6a1af3e01c52cf0149502cc13c326a3f
jobs:
build-apk:
name: Build OSS Debug APK
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
MDVPN_COMMIT: d481d72d4b86783a87d536c214d2c68cc4e9320e
NAIVE_VERSION: v149.0.7827.114-1
OLCRTC_REPO: https://github.com/openlibrecommunity/olcrtc.git
OLCRTC_COMMIT: 1255cf8248ee4a52cb355ceb8cf72281a5f1affd
OLCRTC_COMMIT: 42ae4e0c6a1af3e01c52cf0149502cc13c326a3f
permissions:
contents: read
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ env:
MDVPN_COMMIT: d481d72d4b86783a87d536c214d2c68cc4e9320e
NAIVE_VERSION: v149.0.7827.114-1
OLCRTC_REPO: https://github.com/openlibrecommunity/olcrtc.git
OLCRTC_COMMIT: 1255cf8248ee4a52cb355ceb8cf72281a5f1affd
OLCRTC_COMMIT: 42ae4e0c6a1af3e01c52cf0149502cc13c326a3f

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Sidecar Pins Diverge

This changes the CI pin to 42ae4e0c6a1af3e01c52cf0149502cc13c326a3f, but other APK-producing workflows still set their own OLCRTC_COMMIT values. Those environment values override the new olcrtc.sh default, so release, preview, build, or Depot artifacts can compile a different sidecar than the one CI validates and miss the VP8 peer-restart fix.

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in 3221c17c. The active build, preview, release, and CI workflows now use the same exact full commit as the build script. The inert Depot definition was synchronized as well, without enabling it. Each sidecar cache key already includes OLCRTC_COMMIT.

permissions:
contents: read
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
MDVPN_COMMIT: d481d72d4b86783a87d536c214d2c68cc4e9320e
NAIVE_VERSION: v149.0.7827.114-1
OLCRTC_REPO: https://github.com/openlibrecommunity/olcrtc.git
OLCRTC_COMMIT: 1255cf8248ee4a52cb355ceb8cf72281a5f1affd
OLCRTC_COMMIT: 42ae4e0c6a1af3e01c52cf0149502cc13c326a3f
permissions:
contents: read
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
MDVPN_COMMIT: d481d72d4b86783a87d536c214d2c68cc4e9320e
NAIVE_VERSION: v149.0.7827.114-1
OLCRTC_REPO: https://github.com/openlibrecommunity/olcrtc.git
OLCRTC_COMMIT: 1255cf8248ee4a52cb355ceb8cf72281a5f1affd
OLCRTC_COMMIT: 42ae4e0c6a1af3e01c52cf0149502cc13c326a3f
permissions:
contents: read
jobs:
Expand Down
10 changes: 5 additions & 5 deletions buildScript/lib/olcrtc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
#
# OLCRTC_REPO/OLCRTC_COMMIT default to the upstream project at a commit that carries
# the protected pion net (internal/protect/pionnet.go + the jitsi SetNet hook, merged
# in openlibrecommunity/olcrtc#111) plus Jitsi ICE-service URL normalization
# (openlibrecommunity/olcrtc#121). Pinning at/after both keeps the media path off
# the tun and prevents malformed service-discovery entries from failing peer-
# connection setup.
# in openlibrecommunity/olcrtc#111), Jitsi ICE-service URL normalization
# (openlibrecommunity/olcrtc#121), and VP8 peer-restart corroboration
# (openlibrecommunity/olcrtc#132). The pin keeps the media path off the tun,
# rejects malformed service-discovery entries, and avoids false peer restarts.
#
# Usage: ./run lib olcrtc
set -e
Expand All @@ -37,7 +37,7 @@ if [ -z "$ANDROID_NDK_HOME" ]; then
fi

OLCRTC_REPO="${OLCRTC_REPO:-https://github.com/openlibrecommunity/olcrtc.git}"
OLCRTC_COMMIT="${OLCRTC_COMMIT:-1255cf8248ee4a52cb355ceb8cf72281a5f1affd}"
OLCRTC_COMMIT="${OLCRTC_COMMIT:-42ae4e0c6a1af3e01c52cf0149502cc13c326a3f}"

if ! command -v go >/dev/null 2>&1; then
echo "Error: go not found on PATH (olcRTC needs Go 1.26+)." >&2
Expand Down
Loading