upstream-sync

[prajjwaldimri]

No description provided.

[Copilot]

Pull Request Overview

This PR implements an "upstream-sync" that adds ARM64 support for Windows and streamlines the Windows Ruby installation process. Key changes include refactoring Windows toolchain management to support multiple architectures and consolidating the installation workflow.

• Adds ARM64 architecture support for Windows Ruby installations
• Refactors Windows toolchain installation to use a unified configuration-driven approach
• Simplifies and consolidates multiple Windows installation functions into streamlined workflows

Reviewed Changes

Copilot reviewed 15 out of 17 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
windows.js	Major refactor consolidating toolchain installation functions and adding ARM64 support
windows-versions.json	Restructures version data to support multiple architectures per Ruby version
windows-toolchain-versions.json	New file mapping Ruby versions to appropriate toolchain URLs by architecture
rubygems.js	Updates RubyGems version constraints for Ruby 3.1 vs 3.2+
ruby-builder.js	Adds ARM64 support and integrates JRuby toolchain installation
common.js	Updates path handling and removes Windows-specific MSYS2 logic
bundler.js	Removes platform parameter and Bundler installation workarounds

[Copilot]

Creating a junction symlink across different drives will fail. The code checks if paths are on the same drive but creates a junction regardless. Consider using fs.copySync or similar for cross-drive scenarios.

[Copilot]

The command string construction is vulnerable to command injection if the command parameter contains malicious input. Consider using proper escaping or a safer command execution method.

Suggested change

	const cmd = `cmd.exe /s /c "${command} >NUL && "${process.execPath}" -e console.log(JSON.stringify(process.env))"`
	const env = JSON.parse(cp.execSync(cmd).toString())
	// Only allow trusted commands to be executed
	if (typeof command !== 'string' || !/^[\w\s"=&\\\-.]+$/.test(command)) {
	throw new Error('Invalid command passed to exportCommandEnv');
	}
	const cmd = [
	'/s',
	'/c',
	`${command} >NUL && "${process.execPath}" -e console.log(JSON.stringify(process.env))`
	];
	const env = JSON.parse(cp.execFileSync('cmd.exe', cmd).toString());

[Copilot]

The vcvarsarm64.bat file may not exist on all Windows installations. Consider checking for file existence before using it or providing a fallback.

Suggested change

	const vcVarsBat = os.arch() === 'arm64' ? 'vcvarsarm64.bat' : 'vcvars64.bat'
	const vcVars = `${cp.execSync(cmd).toString().trim()}\\VC\\Auxiliary\\Build\\${vcVarsBat}`
	let newPathEntries = undefined
	for (let [k, v] of newEnv) {
	if (process.env[k] !== v) {
	if (/^Path$/i.test(k)) {
	const newPathStr = v.replace(`${path.delimiter}${process.env['Path']}`, '')
	newPathEntries = newPathStr.split(path.delimiter)
	} else {
	core.exportVariable(k, v)
	}
	if (!fs.existsSync(vcVars)) {
	throw new Error(`Missing vcVars file: ${vcVars}`)
	const installPath = cp.execSync(cmd).toString().trim()
	let vcVars = `${installPath}\\VC\\Auxiliary\\Build\\vcvars64.bat`
	if (os.arch() === 'arm64') {
	const arm64Path = `${installPath}\\VC\\Auxiliary\\Build\\vcvarsarm64.bat`
	if (fs.existsSync(arm64Path)) {
	vcVars = arm64Path
	} else if (!fs.existsSync(vcVars)) {
	throw new Error(`Missing both vcvarsarm64.bat and vcvars64.bat in ${installPath}\\VC\\Auxiliary\\Build`)
	}
	} else if (!fs.existsSync(vcVars)) {
	throw new Error(`Missing vcvars64.bat in ${installPath}\\VC\\Auxiliary\\Build`)

[Copilot]

Case-sensitive replacement of 'Path' may fail if the environment variable is 'PATH' (uppercase). Consider using case-insensitive replacement or checking both variations.

Suggested change

	const paths = env.Path.replace(`${path.delimiter}${process.env.Path}`, '').split(path.delimiter)
	delete env.Path
	// Find the correct case for 'Path' in both env and process.env
	const envPathKey = Object.keys(env).find(k => k.toLowerCase() === 'path');
	const procEnvPathKey = Object.keys(process.env).find(k => k.toLowerCase() === 'path');
	if (!envPathKey || !procEnvPathKey) {
	throw new Error('Could not find Path/PATH in environment variables');
	}
	const paths = env[envPathKey].replace(`${path.delimiter}${process.env[procEnvPathKey]}`, '').split(path.delimiter);
	delete env[envPathKey];