Skip to content

Commit 20c1dc5

Browse files
committed
ci(olcrtc): make sidecar cache key mode-aware and note repo pin
switch the oss sidecars status from cat|sha1sum to git ls-files -s so a mode-only change invalidates the cache, matching the depot workflow. document that OLCRTC_REPO/OLCRTC_COMMIT must pin a commit carrying the protected pion net or the media path is no longer kept off the tun.
1 parent 7af6b06 commit 20c1dc5

2 files changed

Lines changed: 18 additions & 1 deletion

File tree

.github/workflows/ci.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,18 @@ jobs:
125125
- name: Checkout
126126
uses: actions/checkout@v5
127127
- name: Sidecars Status
128-
run: cat buildScript/lib/mieru.sh buildScript/lib/hysteria2.sh buildScript/lib/masterdnsvpn.sh buildScript/lib/naive.sh buildScript/lib/olcrtc.sh buildScript/lib/olcrtc-src/main.go buildScript/lib/olcrtc-src/go.mod buildScript/init/env.sh buildScript/init/env_ndk.sh | sha1sum > sidecars_status
128+
run: |
129+
git ls-files -s -- \
130+
buildScript/lib/mieru.sh \
131+
buildScript/lib/hysteria2.sh \
132+
buildScript/lib/masterdnsvpn.sh \
133+
buildScript/lib/naive.sh \
134+
buildScript/lib/olcrtc.sh \
135+
buildScript/lib/olcrtc-src/main.go \
136+
buildScript/lib/olcrtc-src/go.mod \
137+
buildScript/init/env.sh \
138+
buildScript/init/env_ndk.sh \
139+
| sha1sum > sidecars_status
129140
- name: Sidecars Cache
130141
id: cache
131142
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5

buildScript/lib/olcrtc.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919
# Android protected-net hook) and point the wrapper module at it via a replace
2020
# directive so the build is fully reproducible and offline-stable.
2121
#
22+
# OLCRTC_REPO/OLCRTC_COMMIT default to the fork commit that carries the protected
23+
# pion net (internal/protect/pionnet.go + the jitsi SetNet hook). Overriding them to
24+
# an upstream commit that predates that change builds and runs, but the media path is
25+
# no longer kept off the tun: pin a commit that includes the hook until it lands in
26+
# openlibrecommunity/olcrtc.
27+
#
2228
# Usage: ./run lib olcrtc
2329
set -e
2430
set -o pipefail

0 commit comments

Comments
 (0)