mirror of
https://github.com/okhsunrog/vpnhide.git
synced 2026-04-28 14:44:43 +00:00
Six small review-list items rolled together — all CI/dev-tooling, no runtime behaviour change. #12 Dockerfile: pin Rust 1.95.0 and cargo-ndk 4.1.2 (was floating `stable` + latest cargo-ndk on monthly rebuild). Versions live in ENV vars to make the next bump a one-line edit. #13 Add shellcheck to lint job. SC2034/SC3043 excluded — Magisk reads SKIPUNZIP externally; Android's /system/bin/sh (mksh on Pixel) does support `local` despite POSIX. Verified locally that the 11 .sh files (module-side + dev tooling) pass. shellcheck baked into the CI image via apt; inline apt-get fallback covers the window before image rebuild. #24 ci.yml keystore.properties: replace heredoc with `printf '%s\n'`. Heredoc without single-quoted EOF re-expands $, backticks and backslashes in the password — printf takes the value verbatim. #31 scripts/release.py::patch_file now hard-fails when a regex pattern doesn't match (was silently leaving stale versions). #32 Split rotate_fragments_into_history into rotate + delete steps so release.py can save_json + write_md *before* unlinking the fragment files. If anything in between fails, fragments are still on disk and the run is retryable. #37 codegen-interfaces.py: emit `assert!(matches_vpn(…), msg)` / `assert!(!matches_vpn(…), msg)` instead of `assert_eq!(matches_vpn(…), true/false, msg)` — clippy::bool_assert_comparison was firing on every generated row under `cargo clippy --tests`. Both generated test modules regenerated. CI's clippy steps now also pass `--tests` so this class of regression is caught.
This commit is contained in:
parent
e57417b686
commit
0d4cf09866
7 changed files with 168 additions and 101 deletions
12
.github/docker/ci/Dockerfile
vendored
12
.github/docker/ci/Dockerfile
vendored
|
|
@ -20,6 +20,7 @@ RUN apt-get update && \
|
|||
bc kmod cpio flex bison libssl-dev libelf-dev \
|
||||
binutils-aarch64-linux-gnu \
|
||||
clang-format \
|
||||
shellcheck \
|
||||
git && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
|
|
@ -44,15 +45,20 @@ RUN mkdir -p "${ANDROID_HOME}/cmdline-tools" && \
|
|||
chmod -R a+rx "${ANDROID_HOME}"
|
||||
|
||||
# ── Rust toolchain (for zygisk) ──────────────────────────────────────
|
||||
# Pin both rustc and cargo-ndk versions so monthly image rebuilds don't
|
||||
# silently drift. Bump together with local toolchain when needed; CI
|
||||
# stays reproducible against an exact version.
|
||||
ENV RUSTUP_HOME=/usr/local/rustup \
|
||||
CARGO_HOME=/usr/local/cargo \
|
||||
PATH=/usr/local/cargo/bin:$PATH
|
||||
PATH=/usr/local/cargo/bin:$PATH \
|
||||
RUST_VERSION=1.95.0 \
|
||||
CARGO_NDK_VERSION=4.1.2
|
||||
|
||||
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \
|
||||
sh -s -- -y --default-toolchain stable --profile minimal --no-modify-path && \
|
||||
sh -s -- -y --default-toolchain "${RUST_VERSION}" --profile minimal --no-modify-path && \
|
||||
rustup target add aarch64-linux-android && \
|
||||
rustup component add rustfmt clippy && \
|
||||
cargo install cargo-ndk --locked && \
|
||||
cargo install cargo-ndk --version "${CARGO_NDK_VERSION}" --locked && \
|
||||
chmod -R a+w /usr/local/rustup /usr/local/cargo
|
||||
|
||||
# ── Android NDK (for zygisk) ─────────────────────────────────────────
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue