Commit 5852e5b

committed

Actual fix for Windows path issue

1 parent 82d5195 commit 5852e5bCopy full SHA for 5852e5b

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ jobs:`
`26`	`26`	`macos-14, # ARM`
`27`	`27`	`ubuntu-latest, # x64`
`28`	`28`	`buildjet-2vcpu-ubuntu-2204-arm, # ARM`
`29`		`- #windows-latest, # deactivated for now as there is still a Windows issue`
	`29`	`+ windows-latest,`
`30`	`30`	`]`
`31`	`31`
`32`	`32`	`runs-on: ${{matrix.os}}`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,14 @@ let promptVersions = async () => {`
`66`	`66`	`let installVersions = async ({rescriptVersion, rescriptCoreVersion}) => {`
`67`	`67`	`let packageManager = PackageManagers.getActivePackageManager()`
`68`	`68`	let packages = [`rescript@${rescriptVersion}`, `@rescript/core@${rescriptCoreVersion}`]
`69`		- let command = `${packageManager} add ${packages->Array.join(" ")}`
	`69`	`+`
	`70`	`+ // #58: Windows: packageManager may be something like`
	`71`	`+ // "C:\Program Files\nodejs\node_modules\npm\bin\npm-cli.js".`
	`72`	`+ //`
	`73`	`+ // Therefore, packageManager needs to be in quotes, and we need to prepend "node "`
	`74`	`+ // if packageManager points to a JS file, otherwise the invocation will hang.`
	`75`	`+ let maybeNode = packageManager->String.endsWith("js") ? "node " : ""`
	`76`	+ let command = `${maybeNode}"${packageManager}" add ${packages->Array.join(" ")}`
`70`	`77`
`71`	`78`	`let _ = await Node.Promisified.ChildProcess.exec(command)`
`72`	`79`	`}`

Comments

(0)