yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: make git diff different for CI and local (#34955)

Browse Source
This commit is contained in:
Pavel Feldman 2025-02-27 14:06:13 -08:00 committed by GitHub
parent 7a61aa25e6
commit 31f4a05eb6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
packages/playwright/src/plugins/gitCommitInfoPlugin.ts
View File

@ -122,14 +122,10 @@ async function gitCommitInfo(gitDir: string): Promise<GitCommitInfo | undefined>
'%ct', // committer date, UNIX timestamp '%ct', // committer date, UNIX timestamp
'', // branch '', // branch
]; ];
const commitInfoResult = await spawnAsync( const output = await runGit(`git log -1 --pretty=format:"${tokens.join(separator)}" && git rev-parse --abbrev-ref HEAD`, gitDir);
`git log -1 --pretty=format:"${tokens.join(separator)}" && git rev-parse --abbrev-ref HEAD`, [], if (!output)
{ stdio: 'pipe', cwd: gitDir, timeout: GIT_OPERATIONS_TIMEOUT_MS, shell: true }
);
if (commitInfoResult.code)
return undefined; return undefined;
const showOutput = commitInfoResult.stdout.trim(); const [hash, shortHash, subject, body, authorName, authorEmail, authorTime, committerName, committerEmail, committerTime, branch] = output.split(separator);
const [hash, shortHash, subject, body, authorName, authorEmail, authorTime, committerName, committerEmail, committerTime, branch] = showOutput.split(separator);
return { return {
shortHash, shortHash,
@ -152,13 +148,36 @@ async function gitCommitInfo(gitDir: string): Promise<GitCommitInfo | undefined>
async function gitDiff(gitDir: string, ci?: CIInfo): Promise<string | undefined> { async function gitDiff(gitDir: string, ci?: CIInfo): Promise<string | undefined> {
const diffLimit = 100_000; const diffLimit = 100_000;
const baseHash = ci?.baseHash ?? 'HEAD~1'; if (ci) {
// First try the diff against the base branch.
const diff = await runGit(`git diff ${ci.baseHash}`, gitDir);
if (diff)
return diff.substring(0, diffLimit);
const pullDiffResult = await spawnAsync( // Grow history for shallow checkout.
'git', const output = await runGit('git fetch --deepen=1 && git show HEAD', gitDir);
['diff', baseHash], return output?.substring(0, diffLimit);
{ stdio: 'pipe', cwd: gitDir, timeout: GIT_OPERATIONS_TIMEOUT_MS } }
);
if (!pullDiffResult.code) // Check dirty state first.
return pullDiffResult.stdout.substring(0, diffLimit); const uncommitted = await runGit('git diff', gitDir);
if (uncommitted)
return uncommitted.substring(0, diffLimit);
// Assume non-shallow checkout on local.
const diff = await runGit('git diff HEAD~1', gitDir);
return diff?.substring(0, diffLimit);
}
async function runGit(command: string, cwd: string): Promise<string | undefined> {
const result = await spawnAsync(
command,
[],
{ stdio: 'pipe', cwd, timeout: GIT_OPERATIONS_TIMEOUT_MS, shell: true }
);
if (result.code) {
// eslint-disable-next-line no-console
console.error(`Failed to run ${command}: ${result.stderr}`);
}
return result.code ? undefined : result.stdout.trim();
} }