From 460f011555d2f53deec5654ed4e2ffd26e93262c Mon Sep 17 00:00:00 2001 From: rahul0216 Date: Wed, 22 Jan 2025 21:57:13 +0530 Subject: [PATCH] Updated ts workflow file to fix bugs --- .script/idChangeValidator.ts | 2 +- .script/utils/gitHubWrapper.ts | 2 +- .../workbookCheckers/isVersionIncrementedOnModification.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.script/idChangeValidator.ts b/.script/idChangeValidator.ts index 2015c0d9570..f7d77ec4054 100644 --- a/.script/idChangeValidator.ts +++ b/.script/idChangeValidator.ts @@ -27,7 +27,7 @@ export async function IsIdHasChanged(filePath: string): Promise { return ExitCode.ERROR; } - const options = [pr.targetBranch, pr.sourceBranch, filePath]; + const options = [pr.base.ref, pr.head.ref, filePath]; const diffSummary = await git.diff(options); const idPosition = diffSummary.search(templateIdRegex); const idHasChanged = idPosition > 0; diff --git a/.script/utils/gitHubWrapper.ts b/.script/utils/gitHubWrapper.ts index 90a28ce7384..3c6d9e7d2cd 100644 --- a/.script/utils/gitHubWrapper.ts +++ b/.script/utils/gitHubWrapper.ts @@ -72,7 +72,7 @@ export async function GetDiffFiles(fileKinds: string[], fileTypeSuffixes?: strin console.log(`${changedFiles.length} files changed in current PR`); const filterChangedFiles = changedFiles - .filter(change => fileKinds.includes(change.status)) + .filter(change => fileKinds.map(kind => kind.toLowerCase()).includes(change.status.toLowerCase())) .map(change => change.filename) .filter(filePath => typeof fileTypeSuffixes === "undefined" || filePath.endsWithAny(fileTypeSuffixes)) .filter(filePath => typeof filePathFolderPreffixes === "undefined" || filePath.startsWithAny(filePathFolderPreffixes)) diff --git a/.script/utils/workbookCheckers/isVersionIncrementedOnModification.ts b/.script/utils/workbookCheckers/isVersionIncrementedOnModification.ts index 08e3d3a9fca..e91e7d1543f 100644 --- a/.script/utils/workbookCheckers/isVersionIncrementedOnModification.ts +++ b/.script/utils/workbookCheckers/isVersionIncrementedOnModification.ts @@ -20,7 +20,7 @@ export async function isVersionIncrementedOnModification(items: Array 0){ - const options = [pr.targetBranch, pr.sourceBranch, gitDiffFileFullContentOption, `${workbooksDirectoryPath}/WorkbooksMetadata.json`]; + const options = [pr.base.ref, pr.head.ref, gitDiffFileFullContentOption, `${workbooksDirectoryPath}/WorkbooksMetadata.json`]; const diffSummary = await git.diff(options); const diffLinesArray: string[] = diffSummary.split('\n').map((l: string) => l.trim()); const versionChanges = extractVersionChangesByWorkbook(diffLinesArray);