iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(dev-infra): remove branches created for g3 comparison (#39137) 

Previously, temporary branches were created to be used for comparison to
the g3 branch, instead comparisons are now done using the branches
latest shas.

PR Close #39137
This commit is contained in:
Joey Perrott 2020-10-06 10:13:54 -07:00 committed by Andrew Kushnir
parent ef608bff83
commit 34dbba4a90
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
dev-infra/caretaker/check/g3.ts
View File

@ -35,31 +35,17 @@ export async function printG3Comparison(git: GitClient) {
return; return;
} }
/** Random prefix to create unique branch names. */ /** The latest sha for the g3 branch. */
const randomPrefix = `prefix${Math.floor(Math.random() * 1000000)}`; const g3Ref = getShaForBranchLatest('g3');
/** Ref name of the temporary master branch. */ /** The latest sha for the master branch. */
const masterRef = `${randomPrefix}-master`; const masterRef = getShaForBranchLatest('master');
/** Ref name of the temporary g3 branch. */
const g3Ref = `${randomPrefix}-g3`;
/** Url of the ref for fetching master and g3 branches. */
const refUrl = `https://github.com/${git.remoteConfig.owner}/${git.remoteConfig.name}.git`;
/** The result fo the fetch command. */
const fetchResult =
git.runGraceful(['fetch', '-q', refUrl, `master:${masterRef}`, `g3:${g3Ref}`]);
// If the upstream repository does not have a g3 branch to compare to, skip the comparison. if (!g3Ref && !masterRef) {
if (fetchResult.status !== 0) { return debug('Exiting early as either the g3 or master was unable to be retrieved');
if (fetchResult.stderr.includes(`couldn't find remote ref g3`)) {
return debug('No g3 branch exists on upstream, skipping.');
}
throw Error('Fetch of master and g3 branches for comparison failed.');
} }
/** The statistical information about the git diff between master and g3. */ /** The statistical information about the git diff between master and g3. */
const stats = getDiffStats(git); const stats = getDiffStats();
// Delete the temporarily created mater and g3 branches.
git.runGraceful(['branch', '-D', masterRef, g3Ref]);
info.group(bold('g3 branch check')); info.group(bold('g3 branch check'));
info(`${stats.commits} commits between g3 and master`); info(`${stats.commits} commits between g3 and master`);
@ -73,11 +59,27 @@ export async function printG3Comparison(git: GitClient) {
info(); info();
/** Fetch and retrieve the latest sha for a specific branch. */
function getShaForBranchLatest(branch: string) {
/** The result fo the fetch command. */
const fetchResult = git.runGraceful([
'fetch', '-q', `https://github.com/${git.remoteConfig.owner}/${git.remoteConfig.name}.git`,
branch
]);
if (fetchResult.status !== 0 &&
fetchResult.stderr.includes(`couldn't find remote ref ${branch}`)) {
debug(`No '${branch}' branch exists on upstream, skipping.`);
return false;
}
return git.runGraceful(['rev-parse', 'FETCH_HEAD']).stdout.trim();
}
/** /**
* Get git diff stats between master and g3, for all files and filtered to only g3 affecting * Get git diff stats between master and g3, for all files and filtered to only g3 affecting
* files. * files.
*/ */
function getDiffStats(git: GitClient) { function getDiffStats() {
/** The diff stats to be returned. */ /** The diff stats to be returned. */
const stats = { const stats = {
insertions: 0, insertions: 0,
@ -86,7 +88,6 @@ export async function printG3Comparison(git: GitClient) {
commits: 0, commits: 0,
}; };
// Determine the number of commits between master and g3 refs. */ // Determine the number of commits between master and g3 refs. */
stats.commits = parseInt(git.run(['rev-list', '--count', `${g3Ref}..${masterRef}`]).stdout, 10); stats.commits = parseInt(git.run(['rev-list', '--count', `${g3Ref}..${masterRef}`]).stdout, 10);