diff --git a/dist/index.js b/dist/index.js index 0ac8b1c..ea4c4fc 100644 --- a/dist/index.js +++ b/dist/index.js @@ -27717,34 +27717,14 @@ async function install(platform, engine, version) { return [rubyPrefix, newPathEntries] } -// Remove when Actions Windows image contains MSYS2 install -async function symLinkToEmbeddedMSYS2() { - const toolCacheVersions = tc.findAllVersions('Ruby') - toolCacheVersions.sort() - if (toolCacheVersions.length === 0) { - throw new Error('Could not find MSYS2 in the toolcache') - } - const latestVersion = toolCacheVersions.slice(-1)[0] - const hostedRuby = tc.find('Ruby', latestVersion) - await common.measure('Linking MSYS2', async () => - exec.exec(`cmd /c mklink /D ${msys2} ${hostedRuby}\\msys64`)) -} - async function setupMingw(version) { core.exportVariable('MAKE', 'make.exe') if (version.match(/^2\.[123]/)) { core.exportVariable('SSL_CERT_FILE', certFile) - await common.measure('Installing MSYS1', async () => - installMSYS(version)) - + await common.measure('Installing MSYS', async () => installMSYS(version)) return msysPathEntries } else { - // Remove when Actions Windows image contains MSYS2 install - if (!fs.existsSync(msys2)) { - await symLinkToEmbeddedMSYS2() - } - return msys2PathEntries } } @@ -27778,11 +27758,6 @@ async function setupMSWin() { fs.copyFileSync(certFile, cert) } - // Remove when Actions Windows image contains MSYS2 install - if (!fs.existsSync(msys2)) { - await symLinkToEmbeddedMSYS2() - } - const VCPathEntries = await common.measure('Setting up MSVC environment', async () => addVCVARSEnv()) diff --git a/windows.js b/windows.js index 0e83a7b..e98dc4d 100644 --- a/windows.js +++ b/windows.js @@ -57,34 +57,14 @@ export async function install(platform, engine, version) { return [rubyPrefix, newPathEntries] } -// Remove when Actions Windows image contains MSYS2 install -async function symLinkToEmbeddedMSYS2() { - const toolCacheVersions = tc.findAllVersions('Ruby') - toolCacheVersions.sort() - if (toolCacheVersions.length === 0) { - throw new Error('Could not find MSYS2 in the toolcache') - } - const latestVersion = toolCacheVersions.slice(-1)[0] - const hostedRuby = tc.find('Ruby', latestVersion) - await common.measure('Linking MSYS2', async () => - exec.exec(`cmd /c mklink /D ${msys2} ${hostedRuby}\\msys64`)) -} - async function setupMingw(version) { core.exportVariable('MAKE', 'make.exe') if (version.match(/^2\.[123]/)) { core.exportVariable('SSL_CERT_FILE', certFile) - await common.measure('Installing MSYS1', async () => - installMSYS(version)) - + await common.measure('Installing MSYS', async () => installMSYS(version)) return msysPathEntries } else { - // Remove when Actions Windows image contains MSYS2 install - if (!fs.existsSync(msys2)) { - await symLinkToEmbeddedMSYS2() - } - return msys2PathEntries } } @@ -118,11 +98,6 @@ async function setupMSWin() { fs.copyFileSync(certFile, cert) } - // Remove when Actions Windows image contains MSYS2 install - if (!fs.existsSync(msys2)) { - await symLinkToEmbeddedMSYS2() - } - const VCPathEntries = await common.measure('Setting up MSVC environment', async () => addVCVARSEnv())