mirror of
https://github.com/openclaw/openclaw.git
synced 2026-06-06 14:01:24 +08:00
Summary: - This PR adds opt-in first-parent merge-head diff-base handling for CI changed-scope, changed-lanes, and OpenGrep PR scans, plus synthetic merge coverage and small lint/type cleanups. - PR surface: Source +6, Tests +204, Config +1, Other +179. Total +390 across 15 files. - Reproducibility: yes. The synthetic merge tests and PR body live-ref proof show the stale payload-base path can include main-only files, and first-parent mode narrows it to PR-owned paths. Automerge notes: - PR branch already contained follow-up commit before automerge: fix(ci): update workflow guard expectations - PR branch already contained follow-up commit before automerge: fix(ci): resolve plugin guardrail lint failures - PR branch already contained follow-up commit before automerge: fix(ci): preserve plugin run context typing - PR branch already contained follow-up commit before automerge: fix(ci): scope PR merge diff checks to first parent Validation: - ClawSweeper review passed for head40235e8c3d. - Required merge gates passed before the squash merge. Prepared head SHA:40235e8c3dReview: https://github.com/openclaw/openclaw/pull/90287#issuecomment-4621155576 Co-authored-by: Mason Huang <masonxhuang@tencent.com> Co-authored-by: clawsweeper <274271284+clawsweeper[bot]@users.noreply.github.com> Co-authored-by: clawsweeper[bot] <274271284+clawsweeper[bot]@users.noreply.github.com> Approved-by: hxy91819 Co-authored-by: hxy91819 <8814856+hxy91819@users.noreply.github.com>
124 lines
4.3 KiB
TypeScript
124 lines
4.3 KiB
TypeScript
import { execFileSync } from "node:child_process";
|
|
import fs from "node:fs";
|
|
import path from "node:path";
|
|
import { describe, expect, it } from "vitest";
|
|
import { createScriptTestHarness } from "./test-helpers.js";
|
|
|
|
const { createTempDir } = createScriptTestHarness();
|
|
|
|
function git(cwd: string, ...args: string[]): string {
|
|
return execFileSync("git", args, { cwd, encoding: "utf8" }).trim();
|
|
}
|
|
|
|
function writeFile(filePath: string, content: string): void {
|
|
fs.mkdirSync(path.dirname(filePath), { recursive: true });
|
|
fs.writeFileSync(filePath, content);
|
|
}
|
|
|
|
function copyRunOpengrepFiles(repo: string): void {
|
|
const scriptSource = path.resolve("scripts/run-opengrep.sh");
|
|
const helperSource = path.resolve("scripts/lib/merge-head-diff-base.mjs");
|
|
writeFile(path.join(repo, "scripts/run-opengrep.sh"), fs.readFileSync(scriptSource, "utf8"));
|
|
writeFile(
|
|
path.join(repo, "scripts/lib/merge-head-diff-base.mjs"),
|
|
fs.readFileSync(helperSource, "utf8"),
|
|
);
|
|
fs.chmodSync(path.join(repo, "scripts/run-opengrep.sh"), 0o755);
|
|
}
|
|
|
|
describe("run-opengrep.sh", () => {
|
|
it("validates the rulepack when only OpenGrep rulepack files changed", () => {
|
|
const repo = createTempDir("openclaw-run-opengrep-");
|
|
git(repo, "init", "-q");
|
|
git(repo, "config", "user.email", "test@example.com");
|
|
git(repo, "config", "user.name", "Test User");
|
|
|
|
copyRunOpengrepFiles(repo);
|
|
writeFile(path.join(repo, "security/opengrep/precise.yml"), "rules: []\n");
|
|
git(repo, "add", ".");
|
|
git(repo, "commit", "-qm", "initial");
|
|
|
|
fs.appendFileSync(path.join(repo, "security/opengrep/precise.yml"), "# changed\n");
|
|
const argsPath = path.join(repo, "opengrep-args.txt");
|
|
const binDir = path.join(repo, "bin");
|
|
fs.mkdirSync(binDir);
|
|
writeFile(
|
|
path.join(binDir, "opengrep"),
|
|
[
|
|
"#!/usr/bin/env bash",
|
|
`printf '%s\\n' "$@" > ${JSON.stringify(argsPath)}`,
|
|
"exit 0",
|
|
"",
|
|
].join("\n"),
|
|
);
|
|
fs.chmodSync(path.join(binDir, "opengrep"), 0o755);
|
|
|
|
execFileSync("bash", ["scripts/run-opengrep.sh", "--changed"], {
|
|
cwd: repo,
|
|
env: {
|
|
...process.env,
|
|
PATH: `${binDir}${path.delimiter}${process.env.PATH ?? ""}`,
|
|
OPENCLAW_OPENGREP_BASE_REF: "HEAD",
|
|
},
|
|
encoding: "utf8",
|
|
});
|
|
|
|
const args = fs.readFileSync(path.join(repo, "opengrep-args.txt"), "utf8");
|
|
expect(args).toContain("security/opengrep/precise.yml");
|
|
});
|
|
|
|
it("scans PR files instead of main-only files when the payload base is stale", () => {
|
|
const repo = createTempDir("openclaw-run-opengrep-merge-");
|
|
git(repo, "init", "-q", "--initial-branch=main");
|
|
git(repo, "config", "user.email", "test@example.com");
|
|
git(repo, "config", "user.name", "Test User");
|
|
|
|
copyRunOpengrepFiles(repo);
|
|
writeFile(path.join(repo, "security/opengrep/precise.yml"), "rules: []\n");
|
|
writeFile(path.join(repo, "README.md"), "base\n");
|
|
git(repo, "add", ".");
|
|
git(repo, "commit", "-qm", "base");
|
|
const staleBase = git(repo, "rev-parse", "HEAD");
|
|
|
|
git(repo, "switch", "-q", "-c", "feature");
|
|
writeFile(path.join(repo, "src/pr.ts"), "export const pr = true;\n");
|
|
git(repo, "add", ".");
|
|
git(repo, "commit", "-qm", "feature");
|
|
|
|
git(repo, "switch", "-q", "main");
|
|
writeFile(path.join(repo, "src/main-only.ts"), "export const mainOnly = true;\n");
|
|
git(repo, "add", ".");
|
|
git(repo, "commit", "-qm", "main only");
|
|
git(repo, "merge", "--no-ff", "feature", "-m", "synthetic merge");
|
|
|
|
const argsPath = path.join(repo, "opengrep-args.txt");
|
|
const binDir = path.join(repo, "bin");
|
|
fs.mkdirSync(binDir);
|
|
writeFile(
|
|
path.join(binDir, "opengrep"),
|
|
[
|
|
"#!/usr/bin/env bash",
|
|
`printf '%s\\n' "$@" > ${JSON.stringify(argsPath)}`,
|
|
"exit 0",
|
|
"",
|
|
].join("\n"),
|
|
);
|
|
fs.chmodSync(path.join(binDir, "opengrep"), 0o755);
|
|
|
|
execFileSync("bash", ["scripts/run-opengrep.sh", "--changed"], {
|
|
cwd: repo,
|
|
env: {
|
|
...process.env,
|
|
PATH: `${binDir}${path.delimiter}${process.env.PATH ?? ""}`,
|
|
OPENCLAW_OPENGREP_BASE_REF: `${staleBase}...HEAD`,
|
|
OPENCLAW_OPENGREP_MERGE_HEAD_FIRST_PARENT: "1",
|
|
},
|
|
encoding: "utf8",
|
|
});
|
|
|
|
const args = fs.readFileSync(argsPath, "utf8");
|
|
expect(args).toContain("src/pr.ts");
|
|
expect(args).not.toContain("src/main-only.ts");
|
|
});
|
|
});
|