CmdLine does not forwarding signals

Tasks/BashV3/Tests/L0.ts

@@ -47,9 +47,9 @@ describe('Bash Suite', function () {
             assert(tr.stderr.length === 0, 'Bash should not have written to stderr');
             if (process.platform === 'win32') {
                 // This is different on windows because we change the script name to make sure the normalization call is happening.
-                assert(tr.stdout.indexOf(`Writing bash 'temp/path/script' to temp/path/fileName.sh`) > 0, 'Bash should have written the script to a file');
+                assert(tr.stdout.indexOf(`Writing exec bash 'temp/path/script' to temp/path/fileName.sh`) > 0, 'Bash should have written the script to a file');
             } else {
-                assert(tr.stdout.indexOf(`Writing bash 'path/to/script' to temp/path/fileName.sh`) > 0, 'Bash should have written the script to a file');
+                assert(tr.stdout.indexOf(`Writing exec bash 'path/to/script' to temp/path/fileName.sh`) > 0, 'Bash should have written the script to a file');
             }
 
             assert(tr.stdout.indexOf('my script output') > 0,'Bash should have correctly run the script');
@@ -93,9 +93,9 @@ describe('Bash Suite', function () {
             assert(tr.stderr.length === 0, 'Bash should not have written to stderr');
             if (process.platform === 'win32') {
                 // This is different on windows because we change the script name to make sure the normalization call is happening.
-                assert(tr.stdout.indexOf(`Writing bash 'temp/path/script' myCustomArg to temp/path/fileName.sh`) > 0, 'Bash should have written the script to a file');
+                assert(tr.stdout.indexOf(`Writing exec bash 'temp/path/script' myCustomArg to temp/path/fileName.sh`) > 0, 'Bash should have written the script to a file');
             } else {
-                assert(tr.stdout.indexOf(`Writing bash 'path/to/script' myCustomArg to temp/path/fileName.sh`) > 0, 'Bash should have written the script to a file');
+                assert(tr.stdout.indexOf(`Writing exec bash 'path/to/script' myCustomArg to temp/path/fileName.sh`) > 0, 'Bash should have written the script to a file');
             }
 
             assert(tr.stdout.indexOf('my script output') > 0,'Bash should have correctly run the script');

Tasks/BashV3/bash.ts

@@ -79,7 +79,7 @@ async function run() {
             if (old_source_behavior) {
                 contents = `. '${targetFilePath.replace(/'/g, "'\\''")}' ${input_arguments}`.trim();
             } else {
-                contents = `bash '${targetFilePath.replace(/'/g, "'\\''")}' ${input_arguments}`.trim();
+                contents = `exec bash '${targetFilePath.replace(/'/g, "'\\''")}' ${input_arguments}`.trim();
             }
             console.log(tl.loc('JS_FormattedCommand', contents));
         }
@@ -128,6 +128,11 @@ async function run() {
             ignoreReturnCode: true
         };
 
+        process.on("SIGINT", () => {
+            tl.debug('Started cancellation of executing script');
+            bash.killChildProcess();
+        });
+
         // Listen for stderr.
         let stderrFailure = false;
         const aggregatedStderr: string[] = [];
@@ -153,6 +158,15 @@ async function run() {
 
         let result = tl.TaskResult.Succeeded;
 
+        /**
+         * Exit code null could appeared in situations if executed script don't process cancellation signal,
+         * as we already have message after operation cancellation, we can avoid processing null code here.
+         */
+        if (exitCode === null) {
+            tl.debug('Script execution cancelled');
+            return;
+        }
+
         // Fail on exit code.
         if (exitCode !== 0) {
             tl.error(tl.loc('JS_ExitCode', exitCode));

Tasks/BashV3/package.json

@@ -18,6 +18,6 @@
   "homepage": "https://github.com/Microsoft/azure-pipelines-tasks#readme",
   "dependencies": {
     "uuid": "^3.0.1",
-    "azure-pipelines-task-lib": "2.9.3"
+    "azure-pipelines-task-lib": "2.11.1"
   }
 }

Tasks/BashV3/task.json

@@ -17,8 +17,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 3,
-        "Minor": 171,
-        "Patch": 1
+        "Minor": 176,
+        "Patch": 0
     },
     "releaseNotes": "Script task consistency. Added support for multiple lines and added support for Windows.",
     "minimumAgentVersion": "2.115.0",

Tasks/BashV3/task.loc.json

@@ -17,8 +17,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 3,
-    "Minor": 171,
-    "Patch": 1
+    "Minor": 176,
+    "Patch": 0
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "minimumAgentVersion": "2.115.0",

Tasks/CmdLineV2/cmdline.ts

@@ -13,6 +13,10 @@ async function run() {
         let failOnStderr = tl.getBoolInput('failOnStderr', false);
         let script: string = tl.getInput('script', false) || '';
         let workingDirectory = tl.getPathInput('workingDirectory', /*required*/ true, /*check*/ true);
+
+        if (fs.existsSync(script)) {
+            script = `exec ${script}`;
+        }
 
         // Write the script to disk.
         console.log(tl.loc('GeneratingScript'));
@@ -65,11 +69,25 @@ async function run() {
             });
         }
 
+        process.on("SIGINT", () => {
+            tl.debug('Started cancellation of executing script');
+            bash.killChildProcess();
+        });
+
         // Run bash.
         let exitCode: number = await bash.exec(options);
 
         let result = tl.TaskResult.Succeeded;
 
+        /**
+         * Exit code null could appeared in situations if executed script don't process cancellation signal,
+         * as we already have message after operation cancellation, we can avoid processing null code here.
+         */
+        if (exitCode === null) {
+            tl.debug('Script execution cancelled');
+            return;
+        }
+
         // Fail on exit code.
         if (exitCode !== 0) {
             tl.error(tl.loc('JS_ExitCode', exitCode));

Tasks/CmdLineV2/package.json

@@ -20,7 +20,7 @@
     "uuid": "^3.0.1",
     "@types/mocha": "^8.0.3",
     "@types/node": "^6.0.0",
-    "azure-pipelines-task-lib": "^2.10.1"
+    "azure-pipelines-task-lib": "^2.11.1"
   },
   "devDependencies": {
     "typescript": "4.0.2"

Tasks/CmdLineV2/task.json

@@ -18,7 +18,7 @@
     "version": {
         "Major": 2,
         "Minor": 176,
-        "Patch": 0
+        "Patch": 1
     },
     "releaseNotes": "Script task consistency. Added support for multiple lines.",
     "showEnvironmentVariables": true,

Tasks/CmdLineV2/task.loc.json

@@ -18,7 +18,7 @@
   "version": {
     "Major": 2,
     "Minor": 176,
-    "Patch": 0
+    "Patch": 1
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "showEnvironmentVariables": true,