Skip to content

Commit ad9d907

Browse files
rzhao271deepak1556
andauthored
chore: use node 20 and fix build (#730)
* chore: use node 20 and fix build * chore: bump macOS deployment target * spec: reduce flakyness * Revert "chore: bump macOS deployment target" This reverts commit d9d18b3. --------- Co-authored-by: deepak1556 <hop2deep@gmail.com>
1 parent 8bdbd71 commit ad9d907

2 files changed

Lines changed: 10 additions & 80 deletions

File tree

azure-pipelines.yml

Lines changed: 7 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ extends:
2626
os: Linux
2727
strategy:
2828
matrix:
29-
node_18_x:
30-
node_version: 18.x
29+
node_20_x:
30+
node_version: 20.x
3131
steps:
3232
- task: NodeTool@0
3333
inputs:
@@ -50,8 +50,8 @@ extends:
5050
os: macOS
5151
strategy:
5252
matrix:
53-
node_18_x:
54-
node_version: 18.x
53+
node_20_x:
54+
node_version: 20.x
5555
steps:
5656
- task: NodeTool@0
5757
inputs:
@@ -76,8 +76,8 @@ extends:
7676
os: Windows
7777
strategy:
7878
matrix:
79-
node_18_x:
80-
node_version: 18.x
79+
node_20_x:
80+
node_version: 20.x
8181
steps:
8282
- task: NodeTool@0
8383
inputs:
@@ -93,73 +93,6 @@ extends:
9393
npm run lint
9494
displayName: 'Lint'
9595
96-
# - job: APIScan
97-
# dependsOn: []
98-
# pool:
99-
# name: 1es-oss-windows-2022-x64
100-
# os: Windows
101-
# strategy:
102-
# matrix:
103-
# node_18_x:
104-
# node_version: 18.x
105-
# steps:
106-
# - task: NodeTool@0
107-
# inputs:
108-
# versionSpec: $(node_version)
109-
# displayName: 'Install Node.js'
110-
# - pwsh: |
111-
# $includes = @'
112-
# {
113-
# 'target_defaults': {
114-
# 'conditions': [
115-
# ['OS=="win"', {
116-
# 'msvs_settings': {
117-
# 'VCCLCompilerTool': {
118-
# 'AdditionalOptions': [
119-
# '/Zi',
120-
# '/FS'
121-
# ],
122-
# },
123-
# 'VCLinkerTool': {
124-
# 'AdditionalOptions': [
125-
# '/profile'
126-
# ]
127-
# }
128-
# }
129-
# }]
130-
# ]
131-
# }
132-
# }
133-
# '@
134-
135-
# if (!(Test-Path "~/.gyp")) {
136-
# mkdir "~/.gyp"
137-
# echo $includes > "~/.gyp/include.gypi"
138-
# }
139-
# displayName: Create include.gypi
140-
# - script: |
141-
# npm i
142-
# displayName: 'Install dependencies and build'
143-
144-
# - task: APIScan@2
145-
# inputs:
146-
# softwareFolder: $(Build.SourcesDirectory)\build\Release
147-
# softwareName: 'vscode-node-pty'
148-
# softwareVersionNum: '1'
149-
# isLargeApp: false
150-
# toolVersion: 'Latest'
151-
# displayName: Run ApiScan
152-
# condition: succeeded()
153-
# env:
154-
# AzureServicesAuthConnectionString: $(apiscan-connectionstring)
155-
156-
# - task: PublishSecurityAnalysisLogs@3
157-
# inputs:
158-
# ArtifactName: CodeAnalysisLogs
159-
# ArtifactType: Container
160-
# PublishProcessedResults: false
161-
# AllTools: true
162-
16396
- stage: Release
16497
dependsOn: Build
16598
jobs:
@@ -177,7 +110,7 @@ extends:
177110
steps:
178111
- task: NodeTool@0
179112
inputs:
180-
versionSpec: '18.x'
113+
versionSpec: '20.x'
181114
displayName: 'Install Node.js'
182115
- script: |
183116
npm i

src/unixTerminal.test.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -272,23 +272,20 @@ if (process.platform !== 'win32') {
272272
ptyProcess.on('data', function (data) {
273273
if (ptyProcess.process === 'Python') {
274274
console.log('title', ptyProcess.process);
275+
console.log('ready', ptyProcess.pid);
275276
}
276277
});
277-
setTimeout(() => null, 500);
278-
console.log('ready', ptyProcess.pid);
279278
`;
280279
const p = cp.spawn('node', ['-e', data]);
281280
let sub = '';
282281
let pid = '';
283282
p.stdout.on('data', (data) => {
284283
if (!data.toString().indexOf('title')) {
285284
sub = data.toString().split(' ')[1].slice(0, -1);
286-
setTimeout(() => {
287-
process.kill(parseInt(pid), 'SIGINT');
288-
p.kill('SIGINT');
289-
}, 200);
290285
} else if (!data.toString().indexOf('ready')) {
291286
pid = data.toString().split(' ')[1].slice(0, -1);
287+
process.kill(parseInt(pid), 'SIGINT');
288+
p.kill('SIGINT');
292289
}
293290
});
294291
p.on('exit', () => {

0 commit comments

Comments
 (0)