Some checks failed
ClawSweeper Dispatch / dispatch (push) Has been cancelled
CodeQL / Security High (actions) (push) Has been cancelled
CodeQL / Security High (channel-runtime-boundary) (push) Has been cancelled
CodeQL / Security High (core-auth-secrets) (push) Has been cancelled
CodeQL / Security High (mcp-process-tool-boundary) (push) Has been cancelled
CodeQL / Security High (network-ssrf-boundary) (push) Has been cancelled
CodeQL / Security High (plugin-trust-boundary) (push) Has been cancelled
CodeQL / Security High (process-exec-boundary) (push) Has been cancelled
Docs Sync Publish Repo / sync-publish-repo (push) Has been cancelled
Docs / docs (push) Has been cancelled
OpenClaw Stable Main Closeout / Resolve stable release closeout inputs (push) Has been cancelled
OpenClaw Stable Main Closeout / Verify stable main closeout (push) Has been cancelled
Workflow Sanity / no-tabs (push) Has been cancelled
Workflow Sanity / actionlint (push) Has been cancelled
Workflow Sanity / generated-doc-baselines (push) Has been cancelled
CI / runner-admission (push) Has been cancelled
CI / preflight (push) Has been cancelled
CI / security-fast (push) Has been cancelled
CI / pnpm-store-warmup (push) Has been cancelled
CI / build-artifacts (push) Has been cancelled
CI / native-i18n (push) Has been cancelled
CI / ${{ matrix.check_name }} (push) Has been cancelled
CI / ${{ matrix.checkName }} (push) Has been cancelled
CI / checks-node-compat-node22 (push) Has been cancelled
CI / check-bundled-channel-config-metadata (push) Has been cancelled
CI / check-dependencies (push) Has been cancelled
CI / check-guards (push) Has been cancelled
CI / check-lint (push) Has been cancelled
CI / check-prod-types (push) Has been cancelled
CI / check-shrinkwrap (push) Has been cancelled
CI / check-test-types (push) Has been cancelled
CI / check-additional-boundaries-a (push) Has been cancelled
CI / check-additional-boundaries-bcd (push) Has been cancelled
CI / check-additional-extension-bundled (push) Has been cancelled
CI / check-additional-extension-channels (push) Has been cancelled
CI / check-additional-extension-package-boundary (push) Has been cancelled
CI / check-additional-runtime-topology-architecture (push) Has been cancelled
CI / check-session-accessor-boundary (push) Has been cancelled
CI / check-session-transcript-reader-boundary (push) Has been cancelled
CI / check-docs (push) Has been cancelled
CI / skills-python (push) Has been cancelled
CI / macos-swift (push) Has been cancelled
CI / ios-build (push) Has been cancelled
CI / ci-timings-summary (push) Has been cancelled
Native App Locale Refresh / Refresh native fa (push) Has been cancelled
Native App Locale Refresh / Refresh native fr (push) Has been cancelled
Native App Locale Refresh / Refresh native hi (push) Has been cancelled
Native App Locale Refresh / Refresh native id (push) Has been cancelled
Native App Locale Refresh / Refresh native it (push) Has been cancelled
Native App Locale Refresh / Refresh native ja-JP (push) Has been cancelled
Control UI Locale Refresh / plan (push) Has been cancelled
Control UI Locale Refresh / Refresh ${{ matrix.locale }} (push) Has been cancelled
Control UI Locale Refresh / Commit control UI locale refresh (push) Has been cancelled
Live Media Runner Image / Build live media runner image (push) Has been cancelled
Native App Locale Refresh / Refresh native ar (push) Has been cancelled
Native App Locale Refresh / Refresh native de (push) Has been cancelled
Native App Locale Refresh / Refresh native es (push) Has been cancelled
Native App Locale Refresh / Refresh native ko (push) Has been cancelled
Native App Locale Refresh / Refresh native nl (push) Has been cancelled
Native App Locale Refresh / Refresh native pl (push) Has been cancelled
Native App Locale Refresh / Refresh native pt-BR (push) Has been cancelled
Native App Locale Refresh / Refresh native ru (push) Has been cancelled
Native App Locale Refresh / Refresh native sv (push) Has been cancelled
Native App Locale Refresh / Refresh native th (push) Has been cancelled
Native App Locale Refresh / Refresh native tr (push) Has been cancelled
Native App Locale Refresh / Refresh native uk (push) Has been cancelled
Native App Locale Refresh / Refresh native vi (push) Has been cancelled
Native App Locale Refresh / Refresh native zh-CN (push) Has been cancelled
Native App Locale Refresh / Refresh native zh-TW (push) Has been cancelled
Native App Locale Refresh / Commit native locale refresh (push) Has been cancelled
Plugin Init Scaffold Validation / Validate provider scaffold (push) Has been cancelled
Plugin NPM Release / preview_plugins_npm (push) Has been cancelled
Plugin NPM Release / Validate release publish approval (push) Has been cancelled
Plugin NPM Release / preview_plugin_pack (push) Has been cancelled
Plugin NPM Release / publish_plugins_npm (push) Has been cancelled
Sandbox Common Smoke / sandbox-common-smoke (push) Has been cancelled
Website Installer Sync / static (push) Has been cancelled
Website Installer Sync / linux-docker (push) Has been cancelled
Website Installer Sync / macos-installer (push) Has been cancelled
Website Installer Sync / windows-installer (push) Has been cancelled
Website Installer Sync / sync-website (push) Has been cancelled
Adolf is a fork/vendored clone of github.com/openclaw/openclaw (v2026.6.11), free to diverge. Tree copied sans upstream .git; upstream remote added for future syncs. Node pinned to 24 (.nvmrc); engines already require >=22.19. Preserves docs/ARCHITECTURE.md. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LeqyaxJF2nbRXJtae2kNB2
103 lines
2.9 KiB
TypeScript
103 lines
2.9 KiB
TypeScript
// Check No Conflict Markers tests cover check no conflict markers script behavior.
|
|
import { execFileSync } from "node:child_process";
|
|
import fs from "node:fs";
|
|
import path from "node:path";
|
|
import { describe, expect, it } from "vitest";
|
|
import {
|
|
findConflictMarkerLines,
|
|
findConflictMarkersInFiles,
|
|
findConflictMarkersInTrackedFiles,
|
|
listTrackedFiles,
|
|
} from "../../scripts/check-no-conflict-markers.mjs";
|
|
import { createScriptTestHarness } from "./test-helpers.js";
|
|
|
|
const { createTempDir } = createScriptTestHarness();
|
|
|
|
function git(cwd: string, ...args: string[]): string {
|
|
return execFileSync("git", args, {
|
|
cwd,
|
|
encoding: "utf8",
|
|
}).trim();
|
|
}
|
|
|
|
describe("check-no-conflict-markers", () => {
|
|
it("finds git conflict markers at the start of lines", () => {
|
|
expect(
|
|
findConflictMarkerLines(
|
|
[
|
|
"const ok = true;",
|
|
"<<<<<<< HEAD",
|
|
"value = left;",
|
|
"=======",
|
|
"value = right;",
|
|
">>>>>>> main",
|
|
].join("\n"),
|
|
),
|
|
).toEqual([2, 4, 6]);
|
|
});
|
|
|
|
it("ignores marker-like text when it is indented or inline", () => {
|
|
expect(
|
|
findConflictMarkerLines(
|
|
["Example:", " <<<<<<< HEAD", "const text = '======= not a conflict';", "========"].join(
|
|
"\n",
|
|
),
|
|
),
|
|
).toStrictEqual([]);
|
|
});
|
|
|
|
it("scans text files and skips binary files", () => {
|
|
const rootDir = createTempDir("openclaw-conflict-markers-");
|
|
const textFile = path.join(rootDir, "CHANGELOG.md");
|
|
const binaryFile = path.join(rootDir, "image.png");
|
|
fs.writeFileSync(textFile, "<<<<<<< HEAD\nconflict\n>>>>>>> main\n");
|
|
fs.writeFileSync(binaryFile, Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x00]));
|
|
|
|
const violations = findConflictMarkersInFiles([textFile, binaryFile]);
|
|
|
|
expect(violations).toEqual([
|
|
{
|
|
filePath: textFile,
|
|
lines: [1, 3],
|
|
},
|
|
]);
|
|
});
|
|
|
|
it("finds conflict markers in tracked script files", () => {
|
|
const rootDir = createTempDir("openclaw-conflict-markers-");
|
|
git(rootDir, "init", "-q");
|
|
git(rootDir, "config", "user.email", "test@example.com");
|
|
git(rootDir, "config", "user.name", "Test User");
|
|
|
|
const scriptFile = path.join(rootDir, "scripts", "bundled-plugin-metadata-runtime.mjs");
|
|
fs.mkdirSync(path.dirname(scriptFile), { recursive: true });
|
|
fs.writeFileSync(
|
|
scriptFile,
|
|
[
|
|
"<<<<<<< HEAD",
|
|
'const left = "left";',
|
|
"=======",
|
|
'const right = "right";',
|
|
">>>>>>> branch",
|
|
].join("\n"),
|
|
);
|
|
git(rootDir, "add", "scripts/bundled-plugin-metadata-runtime.mjs");
|
|
|
|
expect(findConflictMarkersInFiles(listTrackedFiles(rootDir))).toEqual([
|
|
{
|
|
filePath: scriptFile,
|
|
lines: [1, 3, 5],
|
|
},
|
|
]);
|
|
|
|
const violations = findConflictMarkersInTrackedFiles(rootDir);
|
|
|
|
expect(violations).toEqual([
|
|
{
|
|
filePath: scriptFile,
|
|
lines: [1, 3, 5],
|
|
},
|
|
]);
|
|
});
|
|
});
|