Skip to content

Fix/audit findings #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MaherJon merged 2 commits into from
Oct 18, 2026
Merged

Fix/audit findings #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9644f8d
fix(ci): 修正 core 补丁校验的补丁路径
MaherJon Oct 18, 2026
9665907
fix(ci): 升级 setup-android 到 v4
MaherJon Oct 18, 2026
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
8 changes: 5 additions & 3 deletions .github/workflows/android-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,15 @@ jobs:
- name: 校验 patches/core/*.patch
run: |
shopt -s nullglob
root="$(pwd)"
status=0
count=0
# 注意：git -C core 会切换工作目录，故补丁必须传绝对路径
for p in patches/core/*.patch; do
count=$((count + 1))
if git -C core apply --reverse --check "$p" 2>/dev/null; then
if git -C core apply --reverse --check "$root/$p" 2>/dev/null; then
echo "已应用: $p"
elif git -C core apply --check "$p"; then
elif git -C core apply --check "$root/$p"; then
echo "可应用: $p"
else
echo "::error::core 补丁无法干净应用: $p（上游 core 可能已变更，需要 rebase）"
Expand All @@ -53,7 +55,7 @@ jobs:
distribution: temurin
java-version: '17'

- uses: android-actions/setup-android@v3
- uses: android-actions/setup-android@v4

- name: 安装 NDK 与 platform-tools
run: sdkmanager --install "ndk;27.0.12077973" "platform-tools"
Expand Down
Loading