Skip to content

Commit 83864c2

Browse files
committed
fixup! src,win: add support for fetching arm64 node.lib
1 parent 80f65da commit 83864c2

File tree

2 files changed

+53
-1
lines changed

2 files changed

+53
-1
lines changed

lib/process-release.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const log = require('npmlog')
77

88
// versions where -headers.tar.gz started shipping
99
const headersTarballRange = '>= 3.0.0 || ~0.12.10 || ~0.10.42'
10-
const bitsre = /\/win-(x86|x64)\//
10+
const bitsre = /\/win-(x86|x64|arm64)\//
1111
const bitsreV3 = /\/win-(x86|ia32|x64)\// // io.js v3.x.x shipped with "ia32" but should
1212
// have been "x86"
1313

test/test-process-release.js

+52
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,58 @@ test('test process release - process.release ~ [email protected] / corp build', functi
181181
})
182182
})
183183

184+
test('test process release - process.release ~ [email protected] Windows', function (t) {
185+
t.plan(2)
186+
187+
var release = processRelease([], { opts: {} }, 'v12.8.0', {
188+
name: 'node',
189+
sourceUrl: 'https://nodejs.org/download/release/v12.8.0/node-v12.8.0.tar.gz',
190+
headersUrl: 'https://nodejs.org/download/release/v12.8.0/node-v12.8.0-headers.tar.gz',
191+
libUrl: 'https://nodejs.org/download/release/v12.8.0/win-x64/node.lib'
192+
})
193+
194+
t.equal(release.semver.version, '12.8.0')
195+
delete release.semver
196+
197+
t.deepEqual(release, {
198+
version: '12.8.0',
199+
name: 'node',
200+
baseUrl: 'https://nodejs.org/download/release/v12.8.0/',
201+
tarballUrl: 'https://nodejs.org/download/release/v12.8.0/node-v12.8.0-headers.tar.gz',
202+
shasumsUrl: 'https://nodejs.org/download/release/v12.8.0/SHASUMS256.txt',
203+
versionDir: '12.8.0',
204+
ia32: { libUrl: 'https://nodejs.org/download/release/v12.8.0/win-x86/node.lib', libPath: 'win-x86/node.lib' },
205+
x64: { libUrl: 'https://nodejs.org/download/release/v12.8.0/win-x64/node.lib', libPath: 'win-x64/node.lib' },
206+
arm64: { libUrl: 'https://nodejs.org/download/release/v12.8.0/win-arm64/node.lib', libPath: 'win-arm64/node.lib' }
207+
})
208+
})
209+
210+
test('test process release - process.release ~ [email protected] Windows ARM64', function (t) {
211+
t.plan(2)
212+
213+
var release = processRelease([], { opts: {} }, 'v12.8.0', {
214+
name: 'node',
215+
sourceUrl: 'https://unofficial-builds.nodejs.org/download/release/v12.8.0/node-v12.8.0.tar.gz',
216+
headersUrl: 'https://unofficial-builds.nodejs.org/download/release/v12.8.0/node-v12.8.0-headers.tar.gz',
217+
libUrl: 'https://unofficial-builds.nodejs.org/download/release/v12.8.0/win-arm64/node.lib'
218+
})
219+
220+
t.equal(release.semver.version, '12.8.0')
221+
delete release.semver
222+
223+
t.deepEqual(release, {
224+
version: '12.8.0',
225+
name: 'node',
226+
baseUrl: 'https://unofficial-builds.nodejs.org/download/release/v12.8.0/',
227+
tarballUrl: 'https://unofficial-builds.nodejs.org/download/release/v12.8.0/node-v12.8.0-headers.tar.gz',
228+
shasumsUrl: 'https://unofficial-builds.nodejs.org/download/release/v12.8.0/SHASUMS256.txt',
229+
versionDir: '12.8.0',
230+
ia32: { libUrl: 'https://unofficial-builds.nodejs.org/download/release/v12.8.0/win-x86/node.lib', libPath: 'win-x86/node.lib' },
231+
x64: { libUrl: 'https://unofficial-builds.nodejs.org/download/release/v12.8.0/win-x64/node.lib', libPath: 'win-x64/node.lib' },
232+
arm64: { libUrl: 'https://unofficial-builds.nodejs.org/download/release/v12.8.0/win-arm64/node.lib', libPath: 'win-arm64/node.lib' }
233+
})
234+
})
235+
184236
test('test process release - process.release ~ [email protected] --target=0.10.40', function (t) {
185237
t.plan(2)
186238

0 commit comments

Comments
 (0)