Skip to content

Fix a regression where MAKE on windows has an extra space at the end #765

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

Merged
eregon merged 1 commit into from
May 16, 2025
Merged

Fix a regression where MAKE on windows has an extra space at the end #765

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
4 changes: 2 additions & 2 deletions dist/index.js
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions windows.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ async function installMSYS2(url, rubyPrefix = process.env.RUNNER_TEMP) {

const ridk = `${rubyPrefix}\\bin\\ridk.cmd`
if (fs.existsSync(ridk)) {
await common.measure('Setting up ridk environment', async () => exportCommandEnv(`set MAKE=make && "${ridk}" enable`))
await common.measure('Setting up ridk environment', async () => exportCommandEnv(`set "MAKE=make" && "${ridk}" enable`))
Copy link
Member

@eregon eregon May 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weird, so it was parsed like set MAKE=make && "${ridk}" enable?
Or like set MAKE="make && ${ridk} enable"?

Copy link
Contributor Author

@ntkme ntkme May 16, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CMD's quote and space parsing is really weird: https://superuser.com/questions/57723/prevent-extra-space-when-setting-variable-on-windows-command-line

}

// Examples:
Expand Down Expand Up @@ -212,7 +212,7 @@ async function installVCPKG(url) {
throw new Error(`Missing vcVars file: ${vcVars}`)
}

return exportCommandEnv(`set MAKE=nmake && "${vcVars}"`)
return exportCommandEnv(`set "MAKE=nmake" && "${vcVars}"`)
})
}

Expand Down
Loading