ewilliams28/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-08-27 21:07:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #104181 from openclaw/fix/preserve-release-efficiency-history

Browse Source 
chore(release): preserve efficiency change history
This commit is contained in:
Vincent Koc
2026-07-11 13:35:30 +08:00
committed by GitHub
parent 35d6077db8 358d4cd4cc
commit daf3b86f45
2 changed files with 82 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/pr
+27
View File
@@ -17,6 +17,33 @@ if common_git_dir=$(git -C "$script_parent_dir" rev-parse --path-format=absolute
canonical_repo_root="$(dirname "$common_git_dir")"
canonical_self="$canonical_repo_root/scripts/$(basename "${BASH_SOURCE[0]}")"
if [ "$script_self" != "$canonical_self" ] && [ -x "$canonical_self" ]; then
if ! git -C "$script_parent_dir" diff --quiet HEAD -- \
":(top)scripts/pr" ":(top)scripts/pr-lib" ":(top)scripts/lib/plain-gh.sh" ||
! git -C "$canonical_repo_root" diff --quiet HEAD -- \
":(top)scripts/pr" ":(top)scripts/pr-lib" ":(top)scripts/lib/plain-gh.sh"; then
echo "scripts/pr wrapper files have uncommitted changes in this worktree or the canonical checkout." >&2
echo "Refusing to silently substitute canonical wrapper code from: $canonical_repo_root" >&2
exit 1
fi
linked_wrapper_revision=$(
git -C "$script_parent_dir" rev-parse \
HEAD:scripts/pr \
HEAD:scripts/pr-lib \
HEAD:scripts/lib/plain-gh.sh 2>/dev/null || true
)
canonical_wrapper_revision=$(
git -C "$canonical_repo_root" rev-parse \
HEAD:scripts/pr \
HEAD:scripts/pr-lib \
HEAD:scripts/lib/plain-gh.sh 2>/dev/null || true
)
if [ -z "$linked_wrapper_revision" ] ||
[ "$linked_wrapper_revision" != "$canonical_wrapper_revision" ]; then
echo "scripts/pr implementation differs between this worktree and the canonical checkout." >&2
echo "Refusing to silently substitute canonical wrapper code from: $canonical_repo_root" >&2
echo "Run scripts/pr from a trusted checkout with matching scripts/pr and scripts/pr-lib revisions." >&2
exit 1
fi
exec "$canonical_self" "$@"
fi
fi
test/scripts/pr-wrappers.test.ts
+55 -1
View File
@@ -1,6 +1,6 @@
// PR wrapper tests cover maintainer helper command delegation.
import { spawnSync } from "node:child_process";
import { chmodSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
import { chmodSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { describe, expect, it } from "vitest";
@@ -66,6 +66,60 @@ describe("scripts/pr wrappers", () => {
expect(script).toContain('exec "$base" review-init "$@"');
});
it("refuses to substitute a different canonical wrapper implementation", () => {
const dir = mkdtempSync(join(tmpdir(), "openclaw-pr-wrapper-revision-"));
const repo = join(dir, "repo");
const linked = join(dir, "linked");
mkdirSync(join(repo, "scripts", "lib"), { recursive: true });
mkdirSync(join(repo, "scripts", "pr-lib"), { recursive: true });
writeFileSync(join(repo, "scripts", "pr"), readScript("scripts/pr"));
writeFileSync(join(repo, "scripts", "lib", "plain-gh.sh"), "# canonical\n");
writeFileSync(join(repo, "scripts", "pr-lib", "merge.sh"), "# canonical\n");
chmodSync(join(repo, "scripts", "pr"), 0o755);
const git = (cwd: string, args: string[]) =>
spawnSync("git", args, { cwd, encoding: "utf8", stdio: "pipe" });
expect(git(repo, ["init", "-b", "main"]).status).toBe(0);
expect(git(repo, ["config", "user.name", "OpenClaw Test"]).status).toBe(0);
expect(git(repo, ["config", "user.email", "test@example.invalid"]).status).toBe(0);
expect(git(repo, ["add", "scripts"]).status).toBe(0);
expect(git(repo, ["commit", "-m", "test: canonical wrapper"]).status).toBe(0);
expect(git(repo, ["worktree", "add", "-b", "feature", linked]).status).toBe(0);
writeFileSync(join(linked, "scripts", "pr-lib", "merge.sh"), "# dirty linked\n");
const dirtyLinkedResult = spawnSync(join(linked, "scripts", "pr"), ["ls"], {
cwd: linked,
encoding: "utf8",
});
expect(dirtyLinkedResult.status).toBe(1);
expect(dirtyLinkedResult.stderr).toContain("scripts/pr wrapper files have uncommitted changes");
expect(git(linked, ["restore", "scripts/pr-lib/merge.sh"]).status).toBe(0);
writeFileSync(join(repo, "scripts", "pr-lib", "merge.sh"), "# dirty canonical\n");
const dirtyResult = spawnSync(join(linked, "scripts", "pr"), ["ls"], {
cwd: linked,
encoding: "utf8",
});
expect(dirtyResult.status).toBe(1);
expect(dirtyResult.stderr).toContain("scripts/pr wrapper files have uncommitted changes");
expect(git(repo, ["restore", "scripts/pr-lib/merge.sh"]).status).toBe(0);
writeFileSync(join(linked, "scripts", "pr-lib", "merge.sh"), "# linked\n");
expect(git(linked, ["add", "scripts/pr-lib/merge.sh"]).status).toBe(0);
expect(git(linked, ["commit", "-m", "test: linked wrapper"]).status).toBe(0);
const result = spawnSync(join(linked, "scripts", "pr"), ["ls"], {
cwd: linked,
encoding: "utf8",
});
rmSync(dir, { recursive: true, force: true });
expect(result.status).toBe(1);
expect(result.stderr).toContain(
"scripts/pr implementation differs between this worktree and the canonical checkout.",
);
});
it("verifies local GitHub auth through GraphQL when REST quota is unavailable", () => {
const dir = mkdtempSync(join(tmpdir(), "openclaw-pr-auth-"));
const gh = join(dir, "gh");