Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add signal handling to CmdLineV2, BashV3 tasks #20706

Merged
merged 1 commit into from
Dec 11, 2024
Merged

Add signal handling to CmdLineV2, BashV3 tasks #20706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
328 changes: 220 additions & 108 deletions Tasks/BashV3/_buildConfigs/Node20/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Tasks/BashV3/_buildConfigs/Node20/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
7 changes: 4 additions & 3 deletions Tasks/BashV3/bash.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
96 changes: 48 additions & 48 deletions Tasks/BashV3/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Tasks/BashV3/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion Tasks/BashV3/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/BashV3/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 3,
"Minor": 246,
"Minor": 250,
"Patch": 0
},
"releaseNotes": "ms-resource:loc.releaseNotes",
Expand Down
11 changes: 6 additions & 5 deletions Tasks/CmdLineV2/_buildConfigs/Node20/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tasks/CmdLineV2/_buildConfigs/Node20/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
7 changes: 4 additions & 3 deletions Tasks/CmdLineV2/cmdline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
102 changes: 51 additions & 51 deletions Tasks/CmdLineV2/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Tasks/CmdLineV2/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion Tasks/CmdLineV2/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/CmdLineV2/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 2,
"Minor": 246,
"Minor": 250,
"Patch": 0
},
"releaseNotes": "ms-resource:loc.releaseNotes",
Expand Down
4 changes: 2 additions & 2 deletions _generated/BashV3.versionmap.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Default|3.246.0
Node20-225|3.246.1
Default|3.250.0
Node20-225|3.250.1
7 changes: 4 additions & 3 deletions _generated/BashV3/bash.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading