Merge pull request #92 from riteshcgk/dot-3256

dot-3256 addidas export branch name changes

Author: riteshcgk

src/lib/env.ts

@@ -12,7 +12,9 @@ export default (): Env => {
         GITHUB_ACTIONS,
         FIGMA_TOKEN,
         LT_USERNAME,
-        LT_ACCESS_KEY
+        LT_ACCESS_KEY,
+        BASELINE_BRANCH,
+        CURRENT_BRANCH
     } = process.env
 
     return {
@@ -26,6 +28,8 @@ export default (): Env => {
         GITHUB_ACTIONS,
         FIGMA_TOKEN,
         LT_USERNAME,
-        LT_ACCESS_KEY
+        LT_ACCESS_KEY,
+        BASELINE_BRANCH,
+        CURRENT_BRANCH,
     }
 }

src/lib/git.ts

@@ -31,11 +31,12 @@ export default (ctx: Context): Git => {
 		let gitInfo = JSON.parse(fs.readFileSync(ctx.env.SMARTUI_GIT_INFO_FILEPATH, 'utf-8'));
 
 		return {
-			branch: gitInfo.branch || '',
+			branch: ctx.env.CURRENT_BRANCH || gitInfo.branch || '',
 			commitId: gitInfo.commit_id.slice(0,6) || '',
 			commitMessage: gitInfo.commit_body || '',
 			commitAuthor: gitInfo.commit_author || '',
-			githubURL: (ctx.env.GITHUB_ACTIONS) ? `${constants.GITHUB_API_HOST}/repos/${process.env.GITHUB_REPOSITORY}/statuses/${gitInfo.commit_id}` : ''
+			githubURL: (ctx.env.GITHUB_ACTIONS) ? `${constants.GITHUB_API_HOST}/repos/${process.env.GITHUB_REPOSITORY}/statuses/${gitInfo.commit_id}` : '',
+			baselineBranch: ctx.env.BASELINE_BRANCH || ''
 		}
 	} else {
 		const splitCharacter = '<##>';
@@ -48,15 +49,16 @@ export default (ctx: Context): Git => {
 
 		// e.g. master\n or master\nv1.1\n or master\nv1.1\nv1.2\n
 		var branchAndTags = res[res.length-1].split('\n').filter(n => n);
-		var branch = branchAndTags[0];
+		var branch = ctx.env.CURRENT_BRANCH || branchAndTags[0];
 		var tags = branchAndTags.slice(1);
 
 		return {
 			branch: branch || '',
 			commitId: res[0] || '',
 			commitMessage: res[2] || '',
 			commitAuthor: res[7] || '',
-			githubURL: (ctx.env.GITHUB_ACTIONS) ? `${constants.GITHUB_API_HOST}/repos/${process.env.GITHUB_REPOSITORY}/statuses/${res[1]}` : ''
+			githubURL: (ctx.env.GITHUB_ACTIONS) ? `${constants.GITHUB_API_HOST}/repos/${process.env.GITHUB_REPOSITORY}/statuses/${res[1]}` : '',
+			baselineBranch: ctx.env.BASELINE_BRANCH || ''
 		};
 	}
 }

src/tasks/getGitInfo.ts

@@ -10,6 +10,9 @@ export default (ctx: Context): ListrTask<Context, ListrRendererFactory, ListrRen
             return (!isGitRepo() && !ctx.env.SMARTUI_GIT_INFO_FILEPATH) ? '[SKIPPED] Fetching git repo details; not a git repo' : '';
         },
         task: async (ctx, task): Promise<void> => {
+            if (ctx.env.CURRENT_BRANCH && ctx.env.CURRENT_BRANCH.trim() === '') {
+                throw new Error('Error: The environment variable CURRENT_BRANCH cannot be empty.');
+            }
             try {
                 ctx.git = getGitInfo(ctx);
                 task.output = chalk.gray(`branch: ${ctx.git.branch}, commit: ${ctx.git.commitId}, author: ${ctx.git.commitAuthor}`);

src/types.ts

@@ -48,6 +48,8 @@ export interface Env {
     FIGMA_TOKEN: string | undefined;
     LT_USERNAME : string | undefined;
     LT_ACCESS_KEY : string | undefined;
+    BASELINE_BRANCH: string | undefined;
+    CURRENT_BRANCH: string | undefined;
 }
 
 export interface Snapshot {
@@ -93,6 +95,7 @@ export interface Git {
     commitAuthor: string;
     commitMessage: string;
     githubURL?: string;
+    baselineBranch?: string;
 }
 
 export interface Build {