GitTools#1051 - implemented overrideConfig

arturcic · Mar 3, 2024 · 6fd1bd9 · 6fd1bd9
1 parent 4765b3b
commit 6fd1bd9
Show file tree

Hide file tree

Showing 17 changed files with 98 additions and 46 deletions.
diff --git a/dist/azure/gitreleasemanager/addasset/bundle.js b/dist/azure/gitreleasemanager/addasset/bundle.js
diff --git a/dist/azure/gitreleasemanager/close/bundle.js b/dist/azure/gitreleasemanager/close/bundle.js
diff --git a/dist/azure/gitreleasemanager/create/bundle.js b/dist/azure/gitreleasemanager/create/bundle.js
diff --git a/dist/azure/gitreleasemanager/discard/bundle.js b/dist/azure/gitreleasemanager/discard/bundle.js
diff --git a/dist/azure/gitreleasemanager/open/bundle.js b/dist/azure/gitreleasemanager/open/bundle.js
diff --git a/dist/azure/gitreleasemanager/publish/bundle.js b/dist/azure/gitreleasemanager/publish/bundle.js
diff --git a/dist/azure/gitreleasemanager/setup/bundle.js b/dist/azure/gitreleasemanager/setup/bundle.js
diff --git a/dist/azure/gitversion/execute/bundle.js b/dist/azure/gitversion/execute/bundle.js
diff --git a/dist/azure/gitversion/execute/task.json b/dist/azure/gitversion/execute/task.json
@@ -81,6 +81,14 @@
             "helpMarkDown": "Optional path to config file (defaults to GitVersion.yml)",
             "visibleRule": "useConfigFile = true"
         },
+        {
+            "name": "overrideConfig",
+            "type": "multiLine",
+            "label": "Override Configuration",
+            "defaultValue": "",
+            "required": false,
+            "helpMarkDown": "Optional override for the configuration file. This should be newline-separated key-value pairs, e.g.: \n\nupdate-build-number=false\nnext-version=1.0.0"
+        },
         {
             "name": "updateAssemblyInfo",
             "type": "boolean",

diff --git a/dist/azure/gitversion/setup/bundle.js b/dist/azure/gitversion/setup/bundle.js
diff --git a/dist/github/gitversion/execute/bundle.js b/dist/github/gitversion/execute/bundle.js
diff --git a/dist/github/gitversion/setup/bundle.js b/dist/github/gitversion/setup/bundle.js
diff --git a/gitversion/execute/action.yml b/gitversion/execute/action.yml
@@ -28,6 +28,13 @@ inputs:
     description: Optional path to config file (defaults to GitVersion.yml)
     required: false
     default: 'GitVersion.yml'
+  overrideConfig:
+    description: |
+        Optional override for the configuration file. This should be newline-separated key-value pairs, e.g.:
+        update-build-number=false
+        next-version=1.0.0
+    required: false
+    default: ''
   updateAssemblyInfo:
     description: Whether to update versions in the AssemblyInfo files
     required: false

diff --git a/src/agent/azure/build-agent.ts b/src/agent/azure/build-agent.ts
@@ -86,10 +86,7 @@ class BuildAgent implements IBuildAgent {
     }
 
     public getListInput(input: string, required?: boolean): string[] {
-        return taskLib
-            .getInput(input, required)
-            .split('\n')
-            .filter(x => x !== '')
+        return taskLib.getDelimitedInput(input, '\n', required).filter(x => x !== '')
     }
 
     public getBooleanInput(input: string, required?: boolean): boolean {

diff --git a/src/tools/gitversion/models.ts b/src/tools/gitversion/models.ts
@@ -6,6 +6,7 @@ export enum ExecuteFields {
     disableNormalization = 'disableNormalization',
     useConfigFile = 'useConfigFile',
     configFilePath = 'configFilePath',
+    overrideConfig = 'overrideConfig',
     updateAssemblyInfo = 'updateAssemblyInfo',
     updateAssemblyInfoFilename = 'updateAssemblyInfoFilename',
     additionalArguments = 'additionalArguments',
@@ -18,6 +19,7 @@ export interface GitVersionSettings {
     [ExecuteFields.disableNormalization]: boolean
     [ExecuteFields.useConfigFile]: boolean
     [ExecuteFields.configFilePath]: string
+    [ExecuteFields.overrideConfig]: string[]
     [ExecuteFields.updateAssemblyInfo]: boolean
     [ExecuteFields.updateAssemblyInfoFilename]: string
     [ExecuteFields.additionalArguments]: string

diff --git a/src/tools/gitversion/settings.ts b/src/tools/gitversion/settings.ts
@@ -18,6 +18,7 @@ export class GitVersionSettingsProvider extends SettingsProvider implements IGit
 
         const useConfigFile = this.buildAgent.getBooleanInput(ExecuteFields.useConfigFile)
         const configFilePath = this.buildAgent.getInput(ExecuteFields.configFilePath)
+        const overrideConfig = this.buildAgent.getListInput(ExecuteFields.overrideConfig)
 
         const updateAssemblyInfo = this.buildAgent.getBooleanInput(ExecuteFields.updateAssemblyInfo)
         const updateAssemblyInfoFilename = this.buildAgent.getInput(ExecuteFields.updateAssemblyInfoFilename)
@@ -32,6 +33,7 @@ export class GitVersionSettingsProvider extends SettingsProvider implements IGit
             disableNormalization,
             useConfigFile,
             configFilePath,
+            overrideConfig,
             updateAssemblyInfo,
             updateAssemblyInfoFilename,
             additionalArguments,

diff --git a/src/tools/gitversion/tool.ts b/src/tools/gitversion/tool.ts
@@ -55,6 +55,7 @@ export class GitVersionTool extends DotnetTool implements IGitVersionTool {
             disableCache,
             disableNormalization,
             configFilePath,
+            overrideConfig,
             updateAssemblyInfo,
             updateAssemblyInfoFilename,
             additionalArguments
@@ -77,6 +78,15 @@ export class GitVersionTool extends DotnetTool implements IGitVersionTool {
             }
         }
 
+        if (overrideConfig) {
+            overrideConfig.forEach(config => {
+                config = config.trim()
+                if (config.match(/([a-zA-Z0-9]+(-[a-zA-Z]+)*=[a-zA-Z0-9\- :.']*)/)) {
+                    args.push('/overrideconfig', config)
+                }
+            })
+        }
+
         if (updateAssemblyInfo) {
             args.push('/updateassemblyinfo')