From bb0f760b6c925183520ee0bcc9c4a432a7c8c3c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AA=E3=81=A4=E3=81=8D?= Date: Fri, 16 May 2025 11:00:56 -0700 Subject: [PATCH] Fix a regression where MAKE on windows has an extra space at the end --- dist/index.js | 4 ++-- windows.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/index.js b/dist/index.js index 07b726f38..25e36bf75 100644 --- a/dist/index.js +++ b/dist/index.js @@ -74383,7 +74383,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`)) } // Examples: @@ -74457,7 +74457,7 @@ async function installVCPKG(url) { throw new Error(`Missing vcVars file: ${vcVars}`) } - return exportCommandEnv(`set MAKE=nmake && "${vcVars}"`) + return exportCommandEnv(`set "MAKE=nmake" && "${vcVars}"`) }) } diff --git a/windows.js b/windows.js index f998f6797..12567ec50 100644 --- a/windows.js +++ b/windows.js @@ -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`)) } // Examples: @@ -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}"`) }) }