Skip to content
Merged
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
1 change: 1 addition & 0 deletions .depot/workflows/android-instrumented.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ jobs:
if: steps.libcore-cache.outputs.cache-hit != 'true'
run: ./run lib core


- name: Download assets
run: ./run init action gradle

Expand Down
10 changes: 8 additions & 2 deletions .depot/workflows/build-apk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ env:
MDVPN_REF: android-vpnservice-protect-hook
MDVPN_COMMIT: d481d72d4b86783a87d536c214d2c68cc4e9320e
NAIVE_VERSION: v149.0.7827.114-1
OLCRTC_COMMIT: 3e970ab8ed176a3bcc2ef0ba1d89d0b15775da23
jobs:
build-apk:
name: Build OSS Debug APK
Expand Down Expand Up @@ -62,6 +63,9 @@ jobs:
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 \
| sha256sum \
Expand All @@ -72,7 +76,7 @@ jobs:
uses: actions/cache@v4
with:
path: app/executableSo
key: depot-sidecars-${{ env.GO_VERSION }}-${{ env.NDK_VERSION }}-${{ env.MIERU_VERSION }}-${{ env.HYSTERIA_VERSION }}-${{ env.MDVPN_COMMIT }}-${{ env.NAIVE_VERSION }}-${{ hashFiles('sidecars_status') }}
key: depot-sidecars-${{ env.GO_VERSION }}-${{ env.NDK_VERSION }}-${{ env.MIERU_VERSION }}-${{ env.HYSTERIA_VERSION }}-${{ env.MDVPN_COMMIT }}-${{ env.NAIVE_VERSION }}-${{ env.OLCRTC_COMMIT }}-${{ hashFiles('sidecars_status') }}

- name: Install Go
if: steps.libcore-cache.outputs.cache-hit != 'true' || steps.sidecars-cache.outputs.cache-hit != 'true'
Expand All @@ -84,18 +88,20 @@ jobs:
if: steps.libcore-cache.outputs.cache-hit != 'true'
run: ./run lib core


- name: Build sidecars
if: steps.sidecars-cache.outputs.cache-hit != 'true'
run: |
./run lib mieru
./run lib hysteria2
./run lib masterdnsvpn
./run lib naive
./run lib olcrtc

- name: Verify sidecar artifacts
run: |
for abi in arm64-v8a armeabi-v7a x86 x86_64; do
for so in libmieru.so libhysteria2.so libmasterdnsvpn.so libnaive.so; do
for so in libmieru.so libhysteria2.so libmasterdnsvpn.so libnaive.so libolcrtc.so; do
if [ ! -f "app/executableSo/$abi/$so" ]; then
echo "Error: missing app/executableSo/$abi/$so" >&2
exit 1
Expand Down
1 change: 1 addition & 0 deletions .depot/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ jobs:
if: steps.libcore-cache.outputs.cache-hit != 'true'
run: ./run lib core


- name: Lint
run: ./gradlew app:lintOssDebug

Expand Down
1 change: 1 addition & 0 deletions .depot/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,6 @@ jobs:
if: steps.libcore-cache.outputs.cache-hit != 'true'
run: ./run lib core


- name: Unit Tests
run: ./gradlew app:testOssDebugUnitTest
21 changes: 18 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ env:
MDVPN_REF: android-vpnservice-protect-hook
MDVPN_COMMIT: d481d72d4b86783a87d536c214d2c68cc4e9320e
NAIVE_VERSION: v149.0.7827.114-1
OLCRTC_COMMIT: 3e970ab8ed176a3bcc2ef0ba1d89d0b15775da23
permissions:
contents: read
jobs:
Expand Down Expand Up @@ -124,14 +125,25 @@ jobs:
- name: Checkout
uses: actions/checkout@v5
- name: Sidecars Status
run: cat buildScript/lib/mieru.sh buildScript/lib/hysteria2.sh buildScript/lib/masterdnsvpn.sh buildScript/lib/naive.sh buildScript/init/env.sh buildScript/init/env_ndk.sh | sha1sum > sidecars_status
run: |
git ls-files -s -- \
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
- name: Sidecars Cache
id: cache
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: |
app/executableSo
key: ${{ hashFiles('.github/workflows/*', 'sidecars_status') }}-${{ env.MIERU_VERSION }}-${{ env.HYSTERIA_VERSION }}-${{ env.MDVPN_COMMIT }}-${{ env.NAIVE_VERSION }}-sidecars-ci
key: ${{ hashFiles('.github/workflows/*', 'sidecars_status') }}-${{ env.MIERU_VERSION }}-${{ env.HYSTERIA_VERSION }}-${{ env.MDVPN_COMMIT }}-${{ env.NAIVE_VERSION }}-${{ env.OLCRTC_COMMIT }}-sidecars-ci
- name: Install Golang
if: steps.cache.outputs.cache-hit != 'true'
uses: actions/setup-go@v6
Expand All @@ -149,6 +161,9 @@ jobs:
- name: Naive Download
if: steps.cache.outputs.cache-hit != 'true'
run: ./run lib naive
- name: olcRTC Build
if: steps.cache.outputs.cache-hit != 'true'
run: ./run lib olcrtc
- name: Upload Sidecars
uses: namespace-actions/upload-artifact@v1
with:
Expand Down Expand Up @@ -183,7 +198,7 @@ jobs:
- name: Verify Sidecar Artifacts
run: |
for abi in arm64-v8a armeabi-v7a x86 x86_64; do
for so in libmieru.so libhysteria2.so libmasterdnsvpn.so libnaive.so; do
for so in libmieru.so libhysteria2.so libmasterdnsvpn.so libnaive.so libolcrtc.so; do
if [ ! -f "app/executableSo/$abi/$so" ]; then
echo "Error: missing app/executableSo/$abi/$so (sidecar artifact missing)" >&2
exit 1
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ jniLibs/
/libcore/.build/
/libcore/version_gen.go
/.masterdnsvpn-build/
/.olcrtc-build/
/.olcrtc-gomobile/
Comment thread
greptile-apps[bot] marked this conversation as resolved.
/.olcrtc-wrapper/

# Local config / generated app artifacts
local.properties
Expand Down
Loading