Skip to content

Commit

Permalink
fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
jorgecotillo committed Dec 8, 2021
2 parents e6e6c0b + 4673365 commit 48061bb
Show file tree
Hide file tree
Showing 27 changed files with 33,143 additions and 192 deletions.
6 changes: 4 additions & 2 deletions generator/cmd/generateall.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ executeSynchronous(async () => {
let localPath = args['local-path'];
let summaryPath = args['summary-log-path'];

// localPath refers to the specs repo (azure-rest-api-specs)
if (!localPath) {
localPath = constants.specsRepoPath;
basePaths = await cloneAndGenerateBasePaths(localPath, constants.specsRepoUri, constants.specsRepoCommitHash);
Expand All @@ -43,8 +44,9 @@ executeSynchronous(async () => {
}

if (!summaryPath) {
// generate default full path
summaryPath = path.join(constants.specsRepoPath, 'summary.log');
// using 'localPath' here because at this point it is guaranteed that the folder got created (when cloneAndGenerateBasePaths function is invoked)
// or is an existing path
summaryPath = path.join(localPath, 'summary.log');
console.log(`Summary path not passed, using default value: ${summaryPath}`);
}

Expand Down
Loading

0 comments on commit 48061bb

Please sign in to comment.