Add signal handling to BashV3, CmdLineV2 tasks

microsoft · Dec 10, 2024 · d61d6bf · d61d6bf
1 parent 75ecf01
commit d61d6bf
Show file tree

Hide file tree

Showing 38 changed files with 730 additions and 482 deletions.
diff --git a/Tasks/BashV3/_buildConfigs/Node20/package-lock.json b/Tasks/BashV3/_buildConfigs/Node20/package-lock.json
diff --git a/Tasks/BashV3/_buildConfigs/Node20/package.json b/Tasks/BashV3/_buildConfigs/Node20/package.json
@@ -20,7 +20,7 @@
   "dependencies": {
     "@types/mocha": "^9.1.1",
     "@types/node": "^20.3.1",
-    "azure-pipelines-task-lib": "^4.16.0",
+    "azure-pipelines-task-lib": "^4.17.3",
     "azure-pipelines-tasks-utility-common": "^3.230.0",
     "uuid": "^3.0.1"
   },

diff --git a/Tasks/BashV3/bash.ts b/Tasks/BashV3/bash.ts
@@ -184,9 +184,10 @@ async function run() {
             ignoreReturnCode: true
         };
 
-        process.on("SIGINT", () => {
-            tl.debug('Started cancellation of executing script');
-            bash.killChildProcess();
+        ['SIGHUP', 'SIGINT', 'SIGQUIT', 'SIGTERM', 'EXIT'].forEach((signal) => {
+            process.on(signal, () => {
+                bash.killChildProcess(signal as NodeJS.Signals);
+            });
         });
 
         // Listen for stderr.

diff --git a/Tasks/BashV3/package-lock.json b/Tasks/BashV3/package-lock.json
diff --git a/Tasks/BashV3/package.json b/Tasks/BashV3/package.json
@@ -20,7 +20,7 @@
   "dependencies": {
     "@types/mocha": "^9.1.1",
     "@types/node": "^16.18.105",
-    "azure-pipelines-task-lib": "^4.16.0",
+    "azure-pipelines-task-lib": "^4.17.3",
     "azure-pipelines-tasks-utility-common": "^3.230.0",
     "uuid": "^3.0.1"
   },

diff --git a/Tasks/BashV3/task.json b/Tasks/BashV3/task.json
@@ -17,7 +17,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 3,
-        "Minor": 246,
+        "Minor": 250,
         "Patch": 0
     },
     "releaseNotes": "Script task consistency. Added support for multiple lines and added support for Windows.",

diff --git a/Tasks/BashV3/task.loc.json b/Tasks/BashV3/task.loc.json
@@ -17,7 +17,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 3,
-    "Minor": 246,
+    "Minor": 250,
     "Patch": 0
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",

diff --git a/Tasks/CmdLineV2/_buildConfigs/Node20/package-lock.json b/Tasks/CmdLineV2/_buildConfigs/Node20/package-lock.json
diff --git a/Tasks/CmdLineV2/_buildConfigs/Node20/package.json b/Tasks/CmdLineV2/_buildConfigs/Node20/package.json
@@ -20,7 +20,7 @@
     "@types/mocha": "^8.0.3",
     "@types/node": "^20.3.1",
     "@types/uuid": "^8.3.0",
-    "azure-pipelines-task-lib": "^4.15.0",
+    "azure-pipelines-task-lib": "^4.17.3",
     "uuid": "^8.3.0"
   },
   "devDependencies": {

diff --git a/Tasks/CmdLineV2/cmdline.ts b/Tasks/CmdLineV2/cmdline.ts
@@ -58,9 +58,10 @@ async function run() {
             });
         }
 
-        process.on("SIGINT", () => {
-            tl.debug('Started cancellation of executing script');
-            bash.killChildProcess();
+        ['SIGHUP', 'SIGINT', 'SIGQUIT', 'SIGTERM', 'EXIT'].forEach((signal) => {
+            process.on(signal, () => {
+                bash.killChildProcess(signal as NodeJS.Signals);
+            });
         });
 
         // Run bash.

diff --git a/Tasks/CmdLineV2/package-lock.json b/Tasks/CmdLineV2/package-lock.json
diff --git a/Tasks/CmdLineV2/package.json b/Tasks/CmdLineV2/package.json
@@ -20,7 +20,7 @@
     "@types/mocha": "^8.0.3",
     "@types/node": "^16.11.39",
     "@types/uuid": "^8.3.0",
-    "azure-pipelines-task-lib": "^4.15.0",
+    "azure-pipelines-task-lib": "^4.17.3",
     "uuid": "^8.3.0"
   },
   "devDependencies": {

diff --git a/Tasks/CmdLineV2/task.json b/Tasks/CmdLineV2/task.json
@@ -17,7 +17,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 2,
-        "Minor": 246,
+        "Minor": 250,
         "Patch": 0
     },
     "releaseNotes": "Script task consistency. Added support for multiple lines.",

diff --git a/Tasks/CmdLineV2/task.loc.json b/Tasks/CmdLineV2/task.loc.json
@@ -17,7 +17,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 246,
+    "Minor": 250,
     "Patch": 0
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",

diff --git a/_generated/BashV3.versionmap.txt b/_generated/BashV3.versionmap.txt
@@ -1,2 +1,2 @@
-Default|3.246.0
-Node20-225|3.246.1
+Default|3.250.0
+Node20-225|3.250.1
diff --git a/_generated/BashV3/bash.ts b/_generated/BashV3/bash.ts
@@ -184,9 +184,10 @@ async function run() {
             ignoreReturnCode: true
         };
 
-        process.on("SIGINT", () => {
-            tl.debug('Started cancellation of executing script');
-            bash.killChildProcess();
+        ['SIGHUP', 'SIGINT', 'SIGQUIT', 'SIGTERM', 'EXIT'].forEach((signal) => {
+            process.on(signal, () => {
+                bash.killChildProcess(signal as NodeJS.Signals);
+            });
         });
 
         // Listen for stderr.