vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-03-16 20:40:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: isolate git commit resolution fallbacks

Browse Source
This commit is contained in:
Peter Steinberger
2026-03-08 17:05:53 +00:00
parent c70151e873
commit dd7470730d
2 changed files with 111 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/infra/git-commit.ts
View File

@@ -22,6 +22,12 @@ const formatCommit = (value?: string | null) => {
const cachedGitCommitBySearchDir = new Map<string, string | null>();
export type CommitMetadataReaders = {
readGitCommit?: (searchDir: string, packageRoot: string | null) => string | null | undefined;
readBuildInfoCommit?: () => string | null;
readPackageJsonCommit?: () => string | null;
};
function isMissingPathError(error: unknown): boolean {
if (!(error instanceof Error)) {
return false;
@@ -61,6 +67,10 @@ const cacheGitCommit = (searchDir: string, commit: string | null) => {
return commit;
};
const clearCachedGitCommits = () => {
cachedGitCommitBySearchDir.clear();
};
const resolveGitLookupDepth = (searchDir: string, packageRoot: string | null) => {
if (!packageRoot) {
return undefined;
@@ -176,9 +186,12 @@ export const resolveCommitHash = (
cwd?: string;
env?: NodeJS.ProcessEnv;
moduleUrl?: string;
readers?: CommitMetadataReaders;
} = {},
) => {
const env = options.env ?? process.env;
const readers = options.readers ?? {};
const readGitCommit = readers.readGitCommit ?? readCommitFromGit;
const envCommit = env.GIT_COMMIT?.trim() || env.GIT_SHA?.trim();
const normalized = formatCommit(envCommit);
if (normalized) {
@@ -193,24 +206,28 @@ export const resolveCommitHash = (
moduleUrl: options.moduleUrl,
});
try {
const gitCommit = readCommitFromGit(searchDir, packageRoot);
const gitCommit = readGitCommit(searchDir, packageRoot);
if (gitCommit !== undefined) {
return cacheGitCommit(searchDir, gitCommit);
}
} catch {
// Fall through to baked metadata for packaged installs that are not in a live checkout.
}
const buildInfoCommit = readCommitFromBuildInfo();
const buildInfoCommit = readers.readBuildInfoCommit?.() ?? readCommitFromBuildInfo();
if (buildInfoCommit) {
return cacheGitCommit(searchDir, buildInfoCommit);
}
const pkgCommit = readCommitFromPackageJson();
const pkgCommit = readers.readPackageJsonCommit?.() ?? readCommitFromPackageJson();
if (pkgCommit) {
return cacheGitCommit(searchDir, pkgCommit);
}
try {
return cacheGitCommit(searchDir, readCommitFromGit(searchDir, packageRoot) ?? null);
return cacheGitCommit(searchDir, readGitCommit(searchDir, packageRoot) ?? null);
} catch {
return cacheGitCommit(searchDir, null);
}
};
export const __testing = {
clearCachedGitCommits,
};