Skip to content

Commit 8b04339

Browse files
committed
ci: address review - env_ndk.sh in cache hash, consolidate MIERU_VERSION, pipefail
- Include buildScript/init/env_ndk.sh (NDK version pin) in the Mieru cache-key hash so bumping the NDK invalidates stale binaries. - Hoist MIERU_VERSION to a single workflow-level env block per workflow (was duplicated in the mieru and build jobs). - Add 'set -o pipefail' to mieru.sh as a defensive guard.
1 parent 489f034 commit 8b04339

5 files changed

Lines changed: 17 additions & 24 deletions

File tree

.github/workflows/build.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
- main
77
paths:
88
- 'nb4a.properties'
9+
env:
10+
MIERU_VERSION: v3.34.0
911
jobs:
1012
libcore:
1113
name: Native Build (LibCore)
@@ -35,13 +37,11 @@ jobs:
3537
mieru:
3638
name: Native Build (Mieru)
3739
runs-on: ubuntu-latest
38-
env:
39-
MIERU_VERSION: v3.34.0
4040
steps:
4141
- name: Checkout
4242
uses: actions/checkout@v5
4343
- name: Mieru Status
44-
run: cat buildScript/lib/mieru.sh buildScript/init/env.sh | sha1sum > mieru_status
44+
run: cat buildScript/lib/mieru.sh buildScript/init/env.sh buildScript/init/env_ndk.sh | sha1sum > mieru_status
4545
- name: Mieru Cache
4646
id: cache
4747
uses: actions/cache@v5
@@ -60,8 +60,6 @@ jobs:
6060
build:
6161
name: Build OSS APK
6262
runs-on: ubuntu-latest
63-
env:
64-
MIERU_VERSION: v3.34.0
6563
needs:
6664
- libcore
6765
- mieru
@@ -79,7 +77,7 @@ jobs:
7977
app/libs/libcore.aar
8078
key: ${{ hashFiles('.github/workflows/*', 'golang_status', 'libcore_status') }}
8179
- name: Mieru Status
82-
run: cat buildScript/lib/mieru.sh buildScript/init/env.sh | sha1sum > mieru_status
80+
run: cat buildScript/lib/mieru.sh buildScript/init/env.sh buildScript/init/env_ndk.sh | sha1sum > mieru_status
8381
- name: Mieru Cache
8482
id: mieru-cache
8583
uses: actions/cache@v5

.github/workflows/ci.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
branches:
77
- '*'
88
pull_request:
9+
env:
10+
MIERU_VERSION: v3.34.0
911
jobs:
1012
libcore:
1113
name: Native Build (LibCore)
@@ -40,13 +42,11 @@ jobs:
4042
mieru:
4143
name: Native Build (Mieru)
4244
runs-on: ubuntu-latest
43-
env:
44-
MIERU_VERSION: v3.34.0
4545
steps:
4646
- name: Checkout
4747
uses: actions/checkout@v5
4848
- name: Mieru Status
49-
run: cat buildScript/lib/mieru.sh buildScript/init/env.sh | sha1sum > mieru_status
49+
run: cat buildScript/lib/mieru.sh buildScript/init/env.sh buildScript/init/env_ndk.sh | sha1sum > mieru_status
5050
- name: Mieru Cache
5151
id: cache
5252
uses: actions/cache@v5
@@ -65,8 +65,6 @@ jobs:
6565
build:
6666
name: Build OSS APK
6767
runs-on: ubuntu-latest
68-
env:
69-
MIERU_VERSION: v3.34.0
7068
needs:
7169
- libcore
7270
- mieru
@@ -89,7 +87,7 @@ jobs:
8987
app/libs/libcore.aar
9088
key: ${{ hashFiles('.github/workflows/*', 'golang_status', 'libcore_status') }}-ci
9189
- name: Mieru Status
92-
run: cat buildScript/lib/mieru.sh buildScript/init/env.sh | sha1sum > mieru_status
90+
run: cat buildScript/lib/mieru.sh buildScript/init/env.sh buildScript/init/env_ndk.sh | sha1sum > mieru_status
9391
- name: Mieru Cache
9492
id: mieru-cache
9593
uses: actions/cache@v5

.github/workflows/preview.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: Preview Build
22
on:
33
workflow_dispatch:
44
inputs:
5+
env:
6+
MIERU_VERSION: v3.34.0
57
jobs:
68
libcore:
79
name: Native Build (LibCore)
@@ -31,13 +33,11 @@ jobs:
3133
mieru:
3234
name: Native Build (Mieru)
3335
runs-on: ubuntu-latest
34-
env:
35-
MIERU_VERSION: v3.34.0
3636
steps:
3737
- name: Checkout
3838
uses: actions/checkout@v5
3939
- name: Mieru Status
40-
run: cat buildScript/lib/mieru.sh buildScript/init/env.sh | sha1sum > mieru_status
40+
run: cat buildScript/lib/mieru.sh buildScript/init/env.sh buildScript/init/env_ndk.sh | sha1sum > mieru_status
4141
- name: Mieru Cache
4242
id: cache
4343
uses: actions/cache@v5
@@ -56,8 +56,6 @@ jobs:
5656
build:
5757
name: Build OSS APK
5858
runs-on: ubuntu-latest
59-
env:
60-
MIERU_VERSION: v3.34.0
6159
needs:
6260
- libcore
6361
- mieru
@@ -75,7 +73,7 @@ jobs:
7573
app/libs/libcore.aar
7674
key: ${{ hashFiles('.github/workflows/*', 'golang_status', 'libcore_status') }}
7775
- name: Mieru Status
78-
run: cat buildScript/lib/mieru.sh buildScript/init/env.sh | sha1sum > mieru_status
76+
run: cat buildScript/lib/mieru.sh buildScript/init/env.sh buildScript/init/env_ndk.sh | sha1sum > mieru_status
7977
- name: Mieru Cache
8078
id: mieru-cache
8179
uses: actions/cache@v5

.github/workflows/release.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ on:
88
publish:
99
description: "Publish: If want ignore"
1010
required: false
11+
env:
12+
MIERU_VERSION: v3.34.0
1113
jobs:
1214
libcore:
1315
name: Native Build (LibCore)
@@ -37,13 +39,11 @@ jobs:
3739
mieru:
3840
name: Native Build (Mieru)
3941
runs-on: ubuntu-latest
40-
env:
41-
MIERU_VERSION: v3.34.0
4242
steps:
4343
- name: Checkout
4444
uses: actions/checkout@v5
4545
- name: Mieru Status
46-
run: cat buildScript/lib/mieru.sh buildScript/init/env.sh | sha1sum > mieru_status
46+
run: cat buildScript/lib/mieru.sh buildScript/init/env.sh buildScript/init/env_ndk.sh | sha1sum > mieru_status
4747
- name: Mieru Cache
4848
id: cache
4949
uses: actions/cache@v5
@@ -62,8 +62,6 @@ jobs:
6262
build:
6363
name: Build OSS APK
6464
runs-on: ubuntu-latest
65-
env:
66-
MIERU_VERSION: v3.34.0
6765
needs:
6866
- libcore
6967
- mieru
@@ -81,7 +79,7 @@ jobs:
8179
app/libs/libcore.aar
8280
key: ${{ hashFiles('.github/workflows/*', 'golang_status', 'libcore_status') }}
8381
- name: Mieru Status
84-
run: cat buildScript/lib/mieru.sh buildScript/init/env.sh | sha1sum > mieru_status
82+
run: cat buildScript/lib/mieru.sh buildScript/init/env.sh buildScript/init/env_ndk.sh | sha1sum > mieru_status
8583
- name: Mieru Cache
8684
id: mieru-cache
8785
uses: actions/cache@v5

buildScript/lib/mieru.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#
99
# Usage: ./run lib mieru
1010
set -e
11+
set -o pipefail
1112

1213
source "buildScript/init/env.sh"
1314

0 commit comments

Comments
 (0)