@@ -57,34 +57,14 @@ export async function install(platform, engine, version) {
5757 return [ rubyPrefix , newPathEntries ]
5858}
5959
60- // Remove when Actions Windows image contains MSYS2 install
61- async function symLinkToEmbeddedMSYS2 ( ) {
62- const toolCacheVersions = tc . findAllVersions ( 'Ruby' )
63- toolCacheVersions . sort ( )
64- if ( toolCacheVersions . length === 0 ) {
65- throw new Error ( 'Could not find MSYS2 in the toolcache' )
66- }
67- const latestVersion = toolCacheVersions . slice ( - 1 ) [ 0 ]
68- const hostedRuby = tc . find ( 'Ruby' , latestVersion )
69- await common . measure ( 'Linking MSYS2' , async ( ) =>
70- exec . exec ( `cmd /c mklink /D ${ msys2 } ${ hostedRuby } \\msys64` ) )
71- }
72-
7360async function setupMingw ( version ) {
7461 core . exportVariable ( 'MAKE' , 'make.exe' )
7562
7663 if ( version . match ( / ^ 2 \. [ 1 2 3 ] / ) ) {
7764 core . exportVariable ( 'SSL_CERT_FILE' , certFile )
78- await common . measure ( 'Installing MSYS1' , async ( ) =>
79- installMSYS ( version ) )
80-
65+ await common . measure ( 'Installing MSYS' , async ( ) => installMSYS ( version ) )
8166 return msysPathEntries
8267 } else {
83- // Remove when Actions Windows image contains MSYS2 install
84- if ( ! fs . existsSync ( msys2 ) ) {
85- await symLinkToEmbeddedMSYS2 ( )
86- }
87-
8868 return msys2PathEntries
8969 }
9070}
@@ -118,11 +98,6 @@ async function setupMSWin() {
11898 fs . copyFileSync ( certFile , cert )
11999 }
120100
121- // Remove when Actions Windows image contains MSYS2 install
122- if ( ! fs . existsSync ( msys2 ) ) {
123- await symLinkToEmbeddedMSYS2 ( )
124- }
125-
126101 const VCPathEntries = await common . measure ( 'Setting up MSVC environment' , async ( ) =>
127102 addVCVARSEnv ( ) )
128103
0 commit comments