Skip to content

Commit fbf4a88

Browse files
hawkffhawkff
committed
ci: fix MasterDnsVPN ref env name (MDV_REF -> MDVPN_REF)
The workflows set MDV_REF but masterdnsvpn.sh reads MDVPN_REF, so the ref pin was ineffective (script used its hardcoded default) and the cache key referenced a var that didn't drive the build. Rename to MDVPN_REF so the workflow env actually selects the fork ref and the cache invalidates on change.
1 parent 22b10d5 commit fbf4a88

4 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
env:
1010
MIERU_VERSION: v3.34.0
1111
HYSTERIA_VERSION: v2.9.2
12-
MDV_REF: android-vpnservice-protect-hook
12+
MDVPN_REF: android-vpnservice-protect-hook
1313
permissions:
1414
contents: read
1515
jobs:
@@ -52,7 +52,7 @@ jobs:
5252
with:
5353
path: |
5454
app/executableSo
55-
key: ${{ hashFiles('.github/workflows/*', 'sidecars_status') }}-${{ env.MIERU_VERSION }}-${{ env.HYSTERIA_VERSION }}-${{ env.MDV_REF }}-sidecars
55+
key: ${{ hashFiles('.github/workflows/*', 'sidecars_status') }}-${{ env.MIERU_VERSION }}-${{ env.HYSTERIA_VERSION }}-${{ env.MDVPN_REF }}-sidecars
5656
- name: Install Golang
5757
if: steps.cache.outputs.cache-hit != 'true'
5858
uses: actions/setup-go@v6
@@ -94,7 +94,7 @@ jobs:
9494
with:
9595
path: |
9696
app/executableSo
97-
key: ${{ hashFiles('.github/workflows/*', 'sidecars_status') }}-${{ env.MIERU_VERSION }}-${{ env.HYSTERIA_VERSION }}-${{ env.MDV_REF }}-sidecars
97+
key: ${{ hashFiles('.github/workflows/*', 'sidecars_status') }}-${{ env.MIERU_VERSION }}-${{ env.HYSTERIA_VERSION }}-${{ env.MDVPN_REF }}-sidecars
9898
- name: Verify Sidecar Artifacts
9999
run: |
100100
for abi in arm64-v8a armeabi-v7a x86 x86_64; do

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
env:
1010
MIERU_VERSION: v3.34.0
1111
HYSTERIA_VERSION: v2.9.2
12-
MDV_REF: android-vpnservice-protect-hook
12+
MDVPN_REF: android-vpnservice-protect-hook
1313
permissions:
1414
contents: read
1515
jobs:
@@ -57,7 +57,7 @@ jobs:
5757
with:
5858
path: |
5959
app/executableSo
60-
key: ${{ hashFiles('.github/workflows/*', 'sidecars_status') }}-${{ env.MIERU_VERSION }}-${{ env.HYSTERIA_VERSION }}-${{ env.MDV_REF }}-sidecars-ci
60+
key: ${{ hashFiles('.github/workflows/*', 'sidecars_status') }}-${{ env.MIERU_VERSION }}-${{ env.HYSTERIA_VERSION }}-${{ env.MDVPN_REF }}-sidecars-ci
6161
- name: Install Golang
6262
if: steps.cache.outputs.cache-hit != 'true'
6363
uses: actions/setup-go@v6
@@ -104,7 +104,7 @@ jobs:
104104
with:
105105
path: |
106106
app/executableSo
107-
key: ${{ hashFiles('.github/workflows/*', 'sidecars_status') }}-${{ env.MIERU_VERSION }}-${{ env.HYSTERIA_VERSION }}-${{ env.MDV_REF }}-sidecars-ci
107+
key: ${{ hashFiles('.github/workflows/*', 'sidecars_status') }}-${{ env.MIERU_VERSION }}-${{ env.HYSTERIA_VERSION }}-${{ env.MDVPN_REF }}-sidecars-ci
108108
- name: Verify Sidecar Artifacts
109109
run: |
110110
for abi in arm64-v8a armeabi-v7a x86 x86_64; do

‎.github/workflows/preview.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
env:
66
MIERU_VERSION: v3.34.0
77
HYSTERIA_VERSION: v2.9.2
8-
MDV_REF: android-vpnservice-protect-hook
8+
MDVPN_REF: android-vpnservice-protect-hook
99
permissions:
1010
contents: read
1111
jobs:
@@ -48,7 +48,7 @@ jobs:
4848
with:
4949
path: |
5050
app/executableSo
51-
key: ${{ hashFiles('.github/workflows/*', 'sidecars_status') }}-${{ env.MIERU_VERSION }}-${{ env.HYSTERIA_VERSION }}-${{ env.MDV_REF }}-sidecars
51+
key: ${{ hashFiles('.github/workflows/*', 'sidecars_status') }}-${{ env.MIERU_VERSION }}-${{ env.HYSTERIA_VERSION }}-${{ env.MDVPN_REF }}-sidecars
5252
- name: Install Golang
5353
if: steps.cache.outputs.cache-hit != 'true'
5454
uses: actions/setup-go@v6
@@ -90,7 +90,7 @@ jobs:
9090
with:
9191
path: |
9292
app/executableSo
93-
key: ${{ hashFiles('.github/workflows/*', 'sidecars_status') }}-${{ env.MIERU_VERSION }}-${{ env.HYSTERIA_VERSION }}-${{ env.MDV_REF }}-sidecars
93+
key: ${{ hashFiles('.github/workflows/*', 'sidecars_status') }}-${{ env.MIERU_VERSION }}-${{ env.HYSTERIA_VERSION }}-${{ env.MDVPN_REF }}-sidecars
9494
- name: Verify Sidecar Artifacts
9595
run: |
9696
for abi in arm64-v8a armeabi-v7a x86 x86_64; do

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
env:
1212
MIERU_VERSION: v3.34.0
1313
HYSTERIA_VERSION: v2.9.2
14-
MDV_REF: android-vpnservice-protect-hook
14+
MDVPN_REF: android-vpnservice-protect-hook
1515
permissions:
1616
contents: write
1717
jobs:
@@ -54,7 +54,7 @@ jobs:
5454
with:
5555
path: |
5656
app/executableSo
57-
key: ${{ hashFiles('.github/workflows/*', 'sidecars_status') }}-${{ env.MIERU_VERSION }}-${{ env.HYSTERIA_VERSION }}-${{ env.MDV_REF }}-sidecars
57+
key: ${{ hashFiles('.github/workflows/*', 'sidecars_status') }}-${{ env.MIERU_VERSION }}-${{ env.HYSTERIA_VERSION }}-${{ env.MDVPN_REF }}-sidecars
5858
- name: Install Golang
5959
if: steps.cache.outputs.cache-hit != 'true'
6060
uses: actions/setup-go@v6
@@ -96,7 +96,7 @@ jobs:
9696
with:
9797
path: |
9898
app/executableSo
99-
key: ${{ hashFiles('.github/workflows/*', 'sidecars_status') }}-${{ env.MIERU_VERSION }}-${{ env.HYSTERIA_VERSION }}-${{ env.MDV_REF }}-sidecars
99+
key: ${{ hashFiles('.github/workflows/*', 'sidecars_status') }}-${{ env.MIERU_VERSION }}-${{ env.HYSTERIA_VERSION }}-${{ env.MDVPN_REF }}-sidecars
100100
- name: Verify Sidecar Artifacts
101101
run: |
102102
for abi in arm64-v8a armeabi-v7a x86 x86_64; do

0 commit comments

Comments
 (0)