Fix gradle task to set workingDir to the path of the script (#6771)

* Fix gradle task to set workingDir to the path of the script * make workingDir input more visible
microsoft · Mar 22, 2018 · 528e62a · 528e62a
1 parent 8c07f73
commit 528e62a
Show file tree

Hide file tree

Showing 29 changed files with 77 additions and 48 deletions.
diff --git a/Tasks/Gradle/Strings/resources.resjson/en-US/resources.resjson b/Tasks/Gradle/Strings/resources.resjson/en-US/resources.resjson
@@ -10,10 +10,10 @@
   "loc.group.displayName.CodeAnalysis": "Code Analysis",
   "loc.input.label.wrapperScript": "Gradle wrapper",
   "loc.input.help.wrapperScript": "Relative path from the repository root to the Gradle Wrapper script.",
-  "loc.input.label.options": "Options",
-  "loc.input.label.tasks": "Tasks",
   "loc.input.label.cwd": "Working directory",
   "loc.input.help.cwd": "Working directory in which to run the Gradle build. If not specified, the repository root directory is used.",
+  "loc.input.label.options": "Options",
+  "loc.input.label.tasks": "Tasks",
   "loc.input.label.publishJUnitResults": "Publish to TFS/Team Services",
   "loc.input.help.publishJUnitResults": "Select this option to publish JUnit test results produced by the Gradle build to TFS/Team Services. Each test results file matching `Test Results Files` will be published as a test run in TFS/Team Services.",
   "loc.input.label.testResultsFiles": "Test results files",

diff --git a/Tasks/Gradle/Tests/L0AllDefaultInputs.ts b/Tasks/Gradle/Tests/L0AllDefaultInputs.ts
@@ -6,6 +6,7 @@ let taskPath = path.join(__dirname, '..', 'gradletask.js');
 let tr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
 
 tr.setInput('wrapperScript', 'gradlew');
+tr.setInput('cwd', '/home/repo/src');
 tr.setInput('options', '');
 tr.setInput('tasks', 'build');
 tr.setInput('javaHomeSelection', 'JDKVersion');

diff --git a/Tasks/Gradle/Tests/L0CAEmptyResultsEnabledTools.ts b/Tasks/Gradle/Tests/L0CAEmptyResultsEnabledTools.ts
@@ -32,6 +32,7 @@ process.env['BUILD_ARTIFACTSTAGINGDIRECTORY'] = `${tempDir}`;
 process.env['SYSTEM_DEFAULTWORKINGDIRECTORY'] = `${taskReportValidDir}`; //'/user/build/s';
 
 tr.setInput('wrapperScript', 'gradlew');
+tr.setInput('cwd', '/home/repo/src');
 tr.setInput('options', '');
 tr.setInput('tasks', 'build');
 tr.setInput('javaHomeSelection', 'JDKVersion');

diff --git a/Tasks/Gradle/Tests/L0CANoToolsEnabled.ts b/Tasks/Gradle/Tests/L0CANoToolsEnabled.ts
@@ -32,6 +32,7 @@ process.env['BUILD_ARTIFACTSTAGINGDIRECTORY'] = `${tempDir}`;
 process.env['SYSTEM_DEFAULTWORKINGDIRECTORY'] = `${taskReportValidDir}`; //'/user/build/s';
 
 tr.setInput('wrapperScript', 'gradlew');
+tr.setInput('cwd', '/home/repo/src');
 tr.setInput('options', '');
 tr.setInput('tasks', 'build');
 tr.setInput('javaHomeSelection', 'JDKVersion');

diff --git a/Tasks/Gradle/Tests/L0CANoUploadArtifactsIfReportsEmpty.ts b/Tasks/Gradle/Tests/L0CANoUploadArtifactsIfReportsEmpty.ts
@@ -32,6 +32,7 @@ process.env['BUILD_ARTIFACTSTAGINGDIRECTORY'] = `${tempDir}`;
 process.env['SYSTEM_DEFAULTWORKINGDIRECTORY'] = `${taskReportValidDir}`; //'/user/build/s';
 
 tr.setInput('wrapperScript', 'gradlew');
+tr.setInput('cwd', '/home/repo/src');
 tr.setInput('options', '');
 tr.setInput('tasks', 'build');
 tr.setInput('javaHomeSelection', 'JDKVersion');

diff --git a/Tasks/Gradle/Tests/L0GarbagePublishJUnitResults.ts b/Tasks/Gradle/Tests/L0GarbagePublishJUnitResults.ts
@@ -6,6 +6,7 @@ let taskPath = path.join(__dirname, '..', 'gradletask.js');
 let tr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
 
 tr.setInput('wrapperScript', 'gradlew');
+tr.setInput('cwd', '/home/repo/src');
 tr.setInput('options', '');
 tr.setInput('tasks', 'build');
 tr.setInput('javaHomeSelection', 'JDKVersion');
@@ -18,7 +19,8 @@ tr.setInput('publishJUnitResults', 'garbage');
 let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
     'checkPath': {
         'gradlew': true,
-        'gradlew.bat': true
+        'gradlew.bat': true,
+        '/home/repo/src': true
     },
     'exec': {
         'gradlew build': {

diff --git a/Tasks/Gradle/Tests/L0InvalidPath.ts b/Tasks/Gradle/Tests/L0InvalidPath.ts
@@ -6,15 +6,14 @@ let taskPath = path.join(__dirname, '..', 'gradletask.js');
 let tr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
 
 tr.setInput('wrapperScript', 'gradlew');
+tr.setInput('cwd', '/home/repo/src2');
 tr.setInput('options', '');
 tr.setInput('tasks', 'build');
 tr.setInput('javaHomeSelection', 'JDKVersion');
 tr.setInput('jdkVersion', 'default');
 tr.setInput('publishJUnitResults', 'true');
 tr.setInput('testResultsFiles', '**/build/test-results/TEST-*.xml');
 
-tr.setInput('cwd', '/home/repo/src2');
-
 // provide answers for task mock
 let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
     'checkPath': {

diff --git a/Tasks/Gradle/Tests/L0InvalidWrapperScript.ts b/Tasks/Gradle/Tests/L0InvalidWrapperScript.ts
@@ -6,13 +6,13 @@ let taskPath = path.join(__dirname, '..', 'gradletask.js');
 let tr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
 
 tr.setInput('wrapperScript', '/home/gradlew');
+tr.setInput('cwd', '/home/repo/src2');
 tr.setInput('options', '');
 tr.setInput('tasks', 'build');
 tr.setInput('javaHomeSelection', 'JDKVersion');
 tr.setInput('jdkVersion', 'default');
 tr.setInput('publishJUnitResults', 'true');
 tr.setInput('testResultsFiles', '**/build/test-results/TEST-*.xml');
-tr.setInput('cwd', '/home/repo/src2');
 
 // provide answers for task mock
 let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{

diff --git a/Tasks/Gradle/Tests/L0JDKVersion15.ts b/Tasks/Gradle/Tests/L0JDKVersion15.ts
@@ -6,6 +6,7 @@ let taskPath = path.join(__dirname, '..', 'gradletask.js');
 let tr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
 
 tr.setInput('wrapperScript', 'gradlew');
+tr.setInput('cwd', '/home/repo/src');
 tr.setInput('options', '');
 tr.setInput('tasks', 'build');
 tr.setInput('javaHomeSelection', 'JDKVersion');
@@ -18,7 +19,8 @@ tr.setInput('jdkArchitecture', 'x86');
 let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
     'checkPath': {
         'gradlew': true,
-        'gradlew.bat': true
+        'gradlew.bat': true,
+        '/home/repo/src': true
     },
     'exec': {
         'gradlew build': {

diff --git a/Tasks/Gradle/Tests/L0JDKVersion18.ts b/Tasks/Gradle/Tests/L0JDKVersion18.ts
@@ -6,6 +6,7 @@ let taskPath = path.join(__dirname, '..', 'gradletask.js');
 let tr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
 
 tr.setInput('wrapperScript', 'gradlew');
+tr.setInput('cwd', '/home/repo/src');
 tr.setInput('options', '');
 tr.setInput('tasks', 'build');
 tr.setInput('javaHomeSelection', 'JDKVersion');
@@ -20,7 +21,8 @@ process.env['JAVA_HOME_8_X86'] = '/user/local/bin/Java8'; //replace with mock of
 let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
     'checkPath': {
         'gradlew': true,
-        'gradlew.bat': true
+        'gradlew.bat': true,
+        '/home/repo/src': true
     },
     'exec': {
         'gradlew build': {

diff --git a/Tasks/Gradle/Tests/L0MissingJavaHomeSelectionInput.ts b/Tasks/Gradle/Tests/L0MissingJavaHomeSelectionInput.ts
@@ -6,6 +6,7 @@ let taskPath = path.join(__dirname, '..', 'gradletask.js');
 let tr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
 
 tr.setInput('wrapperScript', 'gradlew');
+tr.setInput('cwd', '/home/repo/src');
 tr.setInput('options', '/o "/p t i" /o /n /s');
 tr.setInput('tasks', 'build test deploy');
 tr.setInput('jdkVersion', 'default');
@@ -18,7 +19,8 @@ tr.setInput('testResultsFiles', '**/build/test-results/TEST-*.xml');
 let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
     'checkPath': {
         'gradlew': true,
-        'gradlew.bat': true
+        'gradlew.bat': true,
+        '/home/repo/src': true
     }
 };
 tr.setAnswers(a);

diff --git a/Tasks/Gradle/Tests/L0MissingPublishJUnitResultsInput.ts b/Tasks/Gradle/Tests/L0MissingPublishJUnitResultsInput.ts
@@ -6,6 +6,7 @@ let taskPath = path.join(__dirname, '..', 'gradletask.js');
 let tr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
 
 tr.setInput('wrapperScript', 'gradlew');
+tr.setInput('cwd', '/home/repo/src');
 tr.setInput('options', '');
 tr.setInput('tasks', 'build');
 tr.setInput('javaHomeSelection', 'JDKVersion');
@@ -18,7 +19,8 @@ tr.setInput('testResultsFiles', '**/build/test-results/TEST-*.xml');
 let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
     'checkPath': {
         'gradlew': true,
-        'gradlew.bat': true
+        'gradlew.bat': true,
+        '/home/repo/src': true
     },
     'exec': {
         'gradlew build': {

diff --git a/Tasks/Gradle/Tests/L0MissingTestResultsFilesInput.ts b/Tasks/Gradle/Tests/L0MissingTestResultsFilesInput.ts
@@ -6,6 +6,7 @@ let taskPath = path.join(__dirname, '..', 'gradletask.js');
 let tr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
 
 tr.setInput('wrapperScript', 'gradlew');
+tr.setInput('cwd', '/home/repo/src');
 tr.setInput('options', '/o "/p t i" /o /n /s');
 tr.setInput('tasks', 'build test deploy');
 tr.setInput('javaHomeSelection', 'JDKVersion');
@@ -18,7 +19,8 @@ tr.setInput('publishJUnitResults', 'true');
 let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
     'checkPath': {
         'gradlew': true,
-        'gradlew.bat': true
+        'gradlew.bat': true,
+        '/home/repo/src': true
     }
 };
 tr.setAnswers(a);

diff --git a/Tasks/Gradle/Tests/L0MultiModuleCheckstyleFindBugsPMD.ts b/Tasks/Gradle/Tests/L0MultiModuleCheckstyleFindBugsPMD.ts
@@ -32,6 +32,7 @@ process.env['BUILD_ARTIFACTSTAGINGDIRECTORY'] = `${tempDir}`;
 process.env['SYSTEM_DEFAULTWORKINGDIRECTORY'] = `${taskReportValidDir}`;
 
 tr.setInput('wrapperScript', 'gradlew');
+tr.setInput('cwd', '/home/repo/src');
 tr.setInput('options', '');
 tr.setInput('tasks', 'build');
 tr.setInput('javaHomeSelection', 'JDKVersion');

diff --git a/Tasks/Gradle/Tests/L0MultipleTasks.ts b/Tasks/Gradle/Tests/L0MultipleTasks.ts
@@ -6,6 +6,7 @@ let taskPath = path.join(__dirname, '..', 'gradletask.js');
 let tr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
 
 tr.setInput('wrapperScript', 'gradlew');
+tr.setInput('cwd', '/home/repo/src');
 tr.setInput('options', '/o "/p t i" /o /n /s');
 tr.setInput('javaHomeSelection', 'JDKVersion');
 tr.setInput('jdkVersion', 'default');
@@ -18,7 +19,8 @@ tr.setInput('tasks', 'build test deploy');
 let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
     'checkPath': {
         'gradlew': true,
-        'gradlew.bat': true
+        'gradlew.bat': true,
+        '/home/repo/src': true
     },
     'exec': {
         'gradlew /o /p t i /o /n /s build test deploy': {

diff --git a/Tasks/Gradle/Tests/L0NoCodeCoverageFail.ts b/Tasks/Gradle/Tests/L0NoCodeCoverageFail.ts
@@ -6,6 +6,7 @@ let taskPath = path.join(__dirname, '..', 'gradletask.js');
 let tr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
 
 tr.setInput('wrapperScript', 'gradlew');
+tr.setInput('cwd', '/home/repo/src');
 tr.setInput('javaHomeSelection', 'JDKVersion');
 tr.setInput('jdkVersion', 'default');
 tr.setInput('testResultsFiles', '**/build/test-results/TEST-*.xml');
@@ -18,7 +19,8 @@ tr.setInput('tasks', 'build');
 let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
     'checkPath': {
         'gradlew': true,
-        'gradlew.bat': true
+        'gradlew.bat': true,
+        '/home/repo/src': true
     },
     'exec': {
         'gradlew.bat properties': {

diff --git a/Tasks/Gradle/Tests/L0NoCodeCoverageSucceed.ts b/Tasks/Gradle/Tests/L0NoCodeCoverageSucceed.ts
@@ -6,6 +6,7 @@ let taskPath = path.join(__dirname, '..', 'gradletask.js');
 let tr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
 
 tr.setInput('wrapperScript', 'gradlew');
+tr.setInput('cwd', '/home/repo/src');
 tr.setInput('javaHomeSelection', 'JDKVersion');
 tr.setInput('jdkVersion', 'default');
 tr.setInput('testResultsFiles', '**/build/test-results/TEST-*.xml');
@@ -18,7 +19,8 @@ tr.setInput('tasks', 'build');
 let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
     'checkPath': {
         'gradlew': true,
-        'gradlew.bat': true
+        'gradlew.bat': true,
+        '/home/repo/src': true
     },
     'exec': {
         'gradlew.bat properties': {

diff --git a/Tasks/Gradle/Tests/L0OptionsSet.ts b/Tasks/Gradle/Tests/L0OptionsSet.ts
@@ -6,6 +6,7 @@ let taskPath = path.join(__dirname, '..', 'gradletask.js');
 let tr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
 
 tr.setInput('wrapperScript', 'gradlew');
+tr.setInput('cwd', '/home/repo/src');
 tr.setInput('options', '/o "/p t i" /o /n /s');
 tr.setInput('tasks', 'build');
 tr.setInput('javaHomeSelection', 'JDKVersion');
@@ -17,7 +18,8 @@ tr.setInput('testResultsFiles', '**/build/test-results/TEST-*.xml');
 let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
     'checkPath': {
         'gradlew': true,
-        'gradlew.bat': true
+        'gradlew.bat': true,
+        '/home/repo/src': true
     },
     'exec': {
         'gradlew /o /p t i /o /n /s build': {

diff --git a/Tasks/Gradle/Tests/L0PublishTestResults.ts b/Tasks/Gradle/Tests/L0PublishTestResults.ts
@@ -6,6 +6,7 @@ let taskPath = path.join(__dirname, '..', 'gradletask.js');
 let tr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
 
 tr.setInput('wrapperScript', 'gradlew');
+tr.setInput('cwd', '/home/repo/src');
 tr.setInput('options', '');
 tr.setInput('tasks', 'build');
 tr.setInput('javaHomeSelection', 'JDKVersion');
@@ -18,7 +19,8 @@ tr.setInput('codeCoverageTool', 'None');
 let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
     'checkPath': {
         'gradlew': true,
-        'gradlew.bat': true
+        'gradlew.bat': true,
+        '/home/repo/src': true
     },
     'exec': {
         'gradlew build': {

diff --git a/Tasks/Gradle/Tests/L0PublishTestResultsNoMatchingResultFiles.ts b/Tasks/Gradle/Tests/L0PublishTestResultsNoMatchingResultFiles.ts
@@ -6,6 +6,7 @@ let taskPath = path.join(__dirname, '..', 'gradletask.js');
 let tr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
 
 tr.setInput('wrapperScript', 'gradlew');
+tr.setInput('cwd', '/home/repo/src');
 tr.setInput('options', '');
 tr.setInput('tasks', 'build');
 tr.setInput('javaHomeSelection', 'JDKVersion');
@@ -18,7 +19,8 @@ tr.setInput('codeCoverageTool', 'None');
 let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
     'checkPath': {
         'gradlew': true,
-        'gradlew.bat': true
+        'gradlew.bat': true,
+        '/home/repo/src': true
     },
     'exec': {
         'gradlew build': {

diff --git a/Tasks/Gradle/Tests/L0SQ.ts b/Tasks/Gradle/Tests/L0SQ.ts
@@ -30,6 +30,7 @@ process.env['BUILD_ARTIFACTSTAGINGDIRECTORY'] = `${tempDir}`;
 process.env['SYSTEM_DEFAULTWORKINGDIRECTORY'] = `${taskReportValidDir}`;
 
 tr.setInput('wrapperScript', 'gradlew');
+tr.setInput('cwd', '/home/repo/src');
 tr.setInput('options', '');
 tr.setInput('tasks', 'build');
 tr.setInput('javaHomeSelection', 'JDKVersion');

diff --git a/Tasks/Gradle/Tests/L0SQGradleDefaultSQDisabled.ts b/Tasks/Gradle/Tests/L0SQGradleDefaultSQDisabled.ts
@@ -32,6 +32,7 @@ process.env['BUILD_REPOSITORY_PROVIDER'] = 'TFSGit';
 process.env['SYSTEM_DEFAULTWORKINGDIRECTORY'] = '/user/build/s';
 
 tr.setInput('wrapperScript', 'gradlew');
+tr.setInput('cwd', '/home/repo/src');
 tr.setInput('options', '');
 tr.setInput('tasks', 'build');
 tr.setInput('javaHomeSelection', 'JDKVersion');

diff --git a/Tasks/Gradle/Tests/L0SingleModuleCheckstyleFindBugsPMD.ts b/Tasks/Gradle/Tests/L0SingleModuleCheckstyleFindBugsPMD.ts
@@ -32,6 +32,7 @@ process.env['BUILD_ARTIFACTSTAGINGDIRECTORY'] = `${tempDir}`;
 process.env['SYSTEM_DEFAULTWORKINGDIRECTORY'] = `${taskReportValidDir}`; //'/user/build/s';
 
 tr.setInput('wrapperScript', 'gradlew');
+tr.setInput('cwd', '/home/repo/src');
 tr.setInput('options', '');
 tr.setInput('tasks', 'build');
 tr.setInput('javaHomeSelection', 'JDKVersion');

diff --git a/Tasks/Gradle/Tests/L0TasksNotSet.ts b/Tasks/Gradle/Tests/L0TasksNotSet.ts
@@ -6,6 +6,7 @@ let taskPath = path.join(__dirname, '..', 'gradletask.js');
 let tr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
 
 tr.setInput('wrapperScript', 'gradlew');
+tr.setInput('cwd', '/home/repo/src');
 tr.setInput('options', '/o "/p t i" /o /n /s');
 tr.setInput('javaHomeSelection', 'JDKVersion');
 tr.setInput('jdkVersion', 'default');
@@ -18,7 +19,8 @@ tr.setInput('testResultsFiles', '**/build/test-results/TEST-*.xml');
 let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
     'checkPath': {
         'gradlew': true,
-        'gradlew.bat': true
+        'gradlew.bat': true,
+        '/home/repo/src': true
     },
     'exec': {
         'gradlew build': {

diff --git a/Tasks/Gradle/Tests/L0ValidCwdPath.ts b/Tasks/Gradle/Tests/L0ValidCwdPath.ts
@@ -6,15 +6,14 @@ let taskPath = path.join(__dirname, '..', 'gradletask.js');
 let tr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
 
 tr.setInput('wrapperScript', 'gradlew');
+tr.setInput('cwd', '/home/repo/src');
 tr.setInput('options', '');
 tr.setInput('tasks', 'build');
 tr.setInput('javaHomeSelection', 'JDKVersion');
 tr.setInput('jdkVersion', 'default');
 tr.setInput('publishJUnitResults', 'true');
 tr.setInput('testResultsFiles', '**/build/test-results/TEST-*.xml');
 
-tr.setInput('cwd', '/home/repo/src');
-
 // provide answers for task mock
 let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
     'checkPath': {

diff --git a/Tasks/Gradle/Tests/L0ValidInputsFailure.ts b/Tasks/Gradle/Tests/L0ValidInputsFailure.ts
@@ -6,6 +6,7 @@ let taskPath = path.join(__dirname, '..', 'gradletask.js');
 let tr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
 
 tr.setInput('wrapperScript', 'gradlew');
+tr.setInput('cwd', '/home/repo/src');
 tr.setInput('options', '');
 tr.setInput('tasks', 'build FAIL');
 tr.setInput('javaHomeSelection', 'JDKVersion');
@@ -17,7 +18,8 @@ tr.setInput('testResultsFiles', '**/build/test-results/TEST-*.xml');
 let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
     'checkPath': {
         'gradlew': true,
-        'gradlew.bat': true
+        'gradlew.bat': true,
+        '/home/repo/src': true
     },
     'exec': {
         'gradlew build FAIL': {

diff --git a/Tasks/Gradle/gradletask.ts b/Tasks/Gradle/gradletask.ts
@@ -173,9 +173,6 @@ async function run() {
 
         // Set working directory
         let workingDirectory: string = tl.getPathInput('cwd', false, true);
-        if (!workingDirectory) {
-            workingDirectory = path.dirname(wrapperScript);
-        }
         tl.cd(workingDirectory);
 
         let javaHomeSelection: string = tl.getInput('javaHomeSelection', true);