chore(ci): align lint gate and add strict audit path (#410)
This commit is contained in:
parent
74c0c7340b
commit
b161fff9ef
5 changed files with 48 additions and 10 deletions
|
|
@ -7,18 +7,26 @@
|
|||
set -euo pipefail
|
||||
|
||||
echo "==> pre-push: checking formatting..."
|
||||
cargo fmt -- --check || {
|
||||
echo "FAIL: cargo fmt -- --check found unformatted code."
|
||||
cargo fmt --all -- --check || {
|
||||
echo "FAIL: cargo fmt --all -- --check found unformatted code."
|
||||
echo "Run 'cargo fmt' and try again."
|
||||
exit 1
|
||||
}
|
||||
|
||||
echo "==> pre-push: running clippy..."
|
||||
cargo clippy -- -D warnings || {
|
||||
echo "FAIL: clippy reported warnings."
|
||||
cargo clippy --all-targets -- -D clippy::correctness || {
|
||||
echo "FAIL: clippy correctness gate reported issues."
|
||||
exit 1
|
||||
}
|
||||
|
||||
if [ "${ZEROCLAW_STRICT_LINT:-0}" = "1" ]; then
|
||||
echo "==> pre-push: running strict clippy warnings gate (ZEROCLAW_STRICT_LINT=1)..."
|
||||
cargo clippy --all-targets -- -D warnings || {
|
||||
echo "FAIL: strict clippy warnings gate reported issues."
|
||||
exit 1
|
||||
}
|
||||
fi
|
||||
|
||||
echo "==> pre-push: running tests..."
|
||||
cargo test || {
|
||||
echo "FAIL: some tests did not pass."
|
||||
|
|
|
|||
|
|
@ -18,8 +18,12 @@ cargo build
|
|||
# Run tests (all must pass)
|
||||
cargo test
|
||||
|
||||
# Format & lint (must pass before PR)
|
||||
cargo fmt && cargo clippy -- -D warnings
|
||||
# Format & lint (required before PR)
|
||||
cargo fmt --all -- --check
|
||||
cargo clippy --all-targets -- -D clippy::correctness
|
||||
|
||||
# Optional strict lint audit (recommended periodically)
|
||||
cargo clippy --all-targets -- -D warnings
|
||||
|
||||
# Release build (~3.4MB)
|
||||
cargo build --release
|
||||
|
|
@ -27,7 +31,19 @@ cargo build --release
|
|||
|
||||
### Pre-push hook
|
||||
|
||||
The repo includes a pre-push hook in `.githooks/` that enforces `cargo fmt --check`, `cargo clippy -- -D warnings`, and `cargo test` before every push. Enable it with `git config core.hooksPath .githooks`.
|
||||
The repo includes a pre-push hook in `.githooks/` that enforces `cargo fmt --all -- --check`, `cargo clippy --all-targets -- -D clippy::correctness`, and `cargo test` before every push. Enable it with `git config core.hooksPath .githooks`.
|
||||
|
||||
For an opt-in strict lint pass during pre-push, set:
|
||||
|
||||
```bash
|
||||
ZEROCLAW_STRICT_LINT=1 git push
|
||||
```
|
||||
|
||||
For full CI parity in Docker, run:
|
||||
|
||||
```bash
|
||||
./dev/ci.sh all
|
||||
```
|
||||
|
||||
To skip it during rapid iteration:
|
||||
|
||||
|
|
@ -325,8 +341,9 @@ impl Tool for YourTool {
|
|||
|
||||
- [ ] PR template sections are completed (including security + rollback)
|
||||
- [ ] `cargo fmt --all -- --check` — code is formatted
|
||||
- [ ] `cargo clippy --all-targets -- -D warnings` — no warnings
|
||||
- [ ] `cargo clippy --all-targets -- -D clippy::correctness` — merge gate lint baseline passes
|
||||
- [ ] `cargo test` — all tests pass locally or skipped tests are explained
|
||||
- [ ] Optional strict audit: `cargo clippy --all-targets -- -D warnings` (run when doing lint cleanup or before release-hardening work)
|
||||
- [ ] New code has inline `#[cfg(test)]` tests
|
||||
- [ ] No new dependencies unless absolutely necessary (we optimize for binary size)
|
||||
- [ ] README updated if adding user-facing features
|
||||
|
|
|
|||
|
|
@ -110,6 +110,12 @@ This runs inside a container:
|
|||
- `cargo audit`
|
||||
- Docker smoke build (`docker build --target dev ...` + `--version` check)
|
||||
|
||||
To run an opt-in strict lint audit locally:
|
||||
|
||||
```bash
|
||||
./dev/ci.sh lint-strict
|
||||
```
|
||||
|
||||
### 3. Run targeted stages
|
||||
|
||||
```bash
|
||||
|
|
|
|||
|
|
@ -26,7 +26,8 @@ Usage: ./dev/ci.sh <command>
|
|||
Commands:
|
||||
build-image Build/update the local CI image
|
||||
shell Open an interactive shell inside the CI container
|
||||
lint Run rustfmt + clippy (container only)
|
||||
lint Run rustfmt + clippy correctness gate (container only)
|
||||
lint-strict Run rustfmt + full clippy warnings gate (container only)
|
||||
test Run cargo test (container only)
|
||||
build Run release build smoke check (container only)
|
||||
audit Run cargo audit (container only)
|
||||
|
|
@ -56,6 +57,10 @@ case "$1" in
|
|||
run_in_ci "cargo fmt --all -- --check && cargo clippy --locked --all-targets -- -D clippy::correctness"
|
||||
;;
|
||||
|
||||
lint-strict)
|
||||
run_in_ci "cargo fmt --all -- --check && cargo clippy --locked --all-targets -- -D warnings"
|
||||
;;
|
||||
|
||||
test)
|
||||
run_in_ci "cargo test --locked --verbose"
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ Merge-blocking checks should stay small and deterministic. Optional checks are u
|
|||
### Merge-Blocking
|
||||
|
||||
- `.github/workflows/ci.yml` (`CI`)
|
||||
- Purpose: Rust validation (`fmt`, `clippy`, `test`, release build smoke) + docs quality checks when docs change
|
||||
- Purpose: Rust validation (`cargo fmt --all -- --check`, `cargo clippy --locked --all-targets -- -D clippy::correctness`, `test`, release build smoke) + docs quality checks when docs change
|
||||
- Merge gate: `CI Required Gate`
|
||||
- `.github/workflows/workflow-sanity.yml` (`Workflow Sanity`)
|
||||
- Purpose: lint GitHub workflow files (`actionlint`, tab checks)
|
||||
|
|
@ -75,6 +75,8 @@ Merge-blocking checks should stay small and deterministic. Optional checks are u
|
|||
## Maintenance Rules
|
||||
|
||||
- Keep merge-blocking checks deterministic and reproducible (`--locked` where applicable).
|
||||
- Keep merge-blocking clippy policy aligned across `.github/workflows/ci.yml`, `dev/ci.sh`, and `.githooks/pre-push` (`cargo clippy --all-targets -- -D clippy::correctness`).
|
||||
- Run strict lint audits regularly via `cargo clippy --all-targets -- -D warnings` (for example through `./dev/ci.sh lint-strict`) and track cleanup in focused PRs.
|
||||
- Prefer explicit workflow permissions (least privilege).
|
||||
- Keep Actions source policy restricted to approved allowlist patterns (see `docs/actions-source-policy.md`).
|
||||
- Use path filters for expensive workflows when practical.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue