Remove buildserver output argument from GitVersion tool as it's dupli…

…cating the actions behavior Removed the '/output buildserver' argument from the `gitversion` tool execution. Updated all related unit tests to reflect this change, ensuring consistency and correctness across different configurations.
arturcic · Dec 6, 2024 · 2f29300 · 2f29300
1 parent d832d56
commit 2f29300
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 33 deletions.
diff --git a/dist/tools/libs/gitversion.mjs b/dist/tools/libs/gitversion.mjs
@@ -93,7 +93,7 @@ class GitVersionTool extends DotnetTool {
     return await super.getRepoPath(settings.targetPath);
   }
   async getExecuteArguments(workDir, options) {
-    const args = [workDir, "/output", "json", "/output", "buildserver"];
+    const args = [workDir, "/output", "json"];
     const {
       useConfigFile,
       disableCache,

diff --git a/dist/tools/libs/gitversion.mjs.map b/dist/tools/libs/gitversion.mjs.map
diff --git a/src/__tests__/tools/gitversion/runner.spec.ts b/src/__tests__/tools/gitversion/runner.spec.ts
@@ -79,9 +79,6 @@ describe('GitVersion Runner', () => {
             expect(getEnv('major')).toBeDefined()
             expect(getEnv('minor')).toBeDefined()
             expect(getEnv('patch')).toBeDefined()
-
-            expect(result.stdout).toContain('Executing GenerateSetVersionMessage')
-            expect(result.stdout).toContain('Executing GenerateBuildLogOutput')
         })
 
         it.sequential('should output Major variable', async () => {

diff --git a/src/__tests__/tools/gitversion/tool.spec.ts b/src/__tests__/tools/gitversion/tool.spec.ts
@@ -152,21 +152,21 @@ describe('GitVersionTool', () => {
     describe('getExecuteArguments', () => {
         it('should return correct arguments for empty settings', async () => {
             const args = await tool.getExecuteArguments('workdir', {} as ExecuteSettings)
-            expect(args).toEqual(['workdir', '/output', 'json', '/output', 'buildserver'])
+            expect(args).toEqual(['workdir', '/output', 'json'])
         })
 
         it('should return correct arguments for settings with cache', async () => {
             const args = await tool.getExecuteArguments('workdir', {
                 disableCache: true
             } as ExecuteSettings)
-            expect(args).toEqual(['workdir', '/output', 'json', '/output', 'buildserver', '/nocache'])
+            expect(args).toEqual(['workdir', '/output', 'json', '/nocache'])
         })
 
         it('should return correct arguments for settings with normalization', async () => {
             const args = await tool.getExecuteArguments('workdir', {
                 disableNormalization: true
             } as ExecuteSettings)
-            expect(args).toEqual(['workdir', '/output', 'json', '/output', 'buildserver', '/nonormalize'])
+            expect(args).toEqual(['workdir', '/output', 'json', '/nonormalize'])
         })
 
         it('should return correct arguments for settings with config', async () => {
@@ -175,7 +175,7 @@ describe('GitVersionTool', () => {
                 useConfigFile: true,
                 configFilePath: 'workdir/GitVersion.yml'
             } as ExecuteSettings)
-            expect(args).toEqual(['workdir', '/output', 'json', '/output', 'buildserver', '/config', 'workdir/GitVersion.yml'])
+            expect(args).toEqual(['workdir', '/output', 'json', '/config', 'workdir/GitVersion.yml'])
         })
 
         it('should return correct arguments for settings with wrong config file', async () => {
@@ -193,17 +193,7 @@ describe('GitVersionTool', () => {
             const args = await tool.getExecuteArguments('workdir', {
                 overrideConfig: ['tag-prefix=release-', 'next-version=1.0.0']
             } as ExecuteSettings)
-            expect(args).toEqual([
-                'workdir',
-                '/output',
-                'json',
-                '/output',
-                'buildserver',
-                '/overrideconfig',
-                'tag-prefix=release-',
-                '/overrideconfig',
-                'next-version=1.0.0'
-            ])
+            expect(args).toEqual(['workdir', '/output', 'json', '/overrideconfig', 'tag-prefix=release-', '/overrideconfig', 'next-version=1.0.0'])
         })
 
         it('should return correct arguments for settings with assembly info', async () => {
@@ -212,7 +202,7 @@ describe('GitVersionTool', () => {
                 updateAssemblyInfo: true,
                 updateAssemblyInfoFilename: 'AssemblyInfo.cs'
             } as ExecuteSettings)
-            expect(args).toEqual(['workdir', '/output', 'json', '/output', 'buildserver', '/updateassemblyinfo', 'AssemblyInfo.cs'])
+            expect(args).toEqual(['workdir', '/output', 'json', '/updateassemblyinfo', 'AssemblyInfo.cs'])
         })
 
         it('should return correct arguments for settings with wrong assembly info', async () => {
@@ -234,17 +224,7 @@ describe('GitVersionTool', () => {
                 updateAssemblyInfo: true,
                 updateAssemblyInfoFilename: 'AssemblyInfo.cs'
             } as ExecuteSettings)
-            expect(args).toEqual([
-                'workdir',
-                '/output',
-                'json',
-                '/output',
-                'buildserver',
-                '/config',
-                'workdir/GitVersion.yml',
-                '/updateassemblyinfo',
-                'AssemblyInfo.cs'
-            ])
+            expect(args).toEqual(['workdir', '/output', 'json', '/config', 'workdir/GitVersion.yml', '/updateassemblyinfo', 'AssemblyInfo.cs'])
         })
     })
 

diff --git a/src/tools/gitversion/tool.ts b/src/tools/gitversion/tool.ts
@@ -71,7 +71,7 @@ export class GitVersionTool extends DotnetTool {
     }
 
     protected async getExecuteArguments(workDir: string, options: ExecuteSettings): Promise<string[]> {
-        const args = [workDir, '/output', 'json', '/output', 'buildserver']
+        const args = [workDir, '/output', 'json']
 
         const {
             useConfigFile,