@@ -7,7 +7,6 @@ const path = require('path')
77const cp = require ( 'child_process' )
88const core = require ( '@actions/core' )
99const exec = require ( '@actions/exec' )
10- const tc = require ( '@actions/tool-cache' )
1110const common = require ( './common' )
1211const rubyInstallerVersions = require ( './windows-versions.json' )
1312const toolchainVersions = require ( './windows-toolchain-versions.json' )
@@ -81,8 +80,7 @@ export async function install(platform, engine, version) {
8180async function downloadAndExtract ( engine , version , url , base , rubyPrefix ) {
8281 const downloadPath = await common . measure ( 'Downloading Ruby' , async ( ) => {
8382 console . log ( url )
84- const auth = common . inputs . token ? `token ${ common . inputs . token } ` : undefined
85- return await tc . downloadTool ( url , undefined , auth )
83+ return await common . download ( url )
8684 } )
8785
8886 const extractPath = process . env . RUNNER_TEMP
@@ -114,8 +112,7 @@ export async function installJRubyTools() {
114112async function installMSYS2 ( url , rubyPrefix = process . env . RUNNER_TEMP ) {
115113 const downloadPath = await common . measure ( 'Downloading msys2 build tools' , async ( ) => {
116114 console . log ( url )
117- const auth = common . inputs . token ? `token ${ common . inputs . token } ` : undefined
118- return await tc . downloadTool ( url , undefined , auth )
115+ return await common . download ( url )
119116 } )
120117
121118 const extractPath = path . join ( process . env . RUNNER_TEMP , 'msys64' )
@@ -162,8 +159,7 @@ async function installMSYS1(url) {
162159
163160 const downloadPath = await common . measure ( 'Downloading msys1 build tools' , async ( ) => {
164161 console . log ( url )
165- const auth = common . inputs . token ? `token ${ common . inputs . token } ` : undefined
166- return await tc . downloadTool ( url , undefined , auth )
162+ return await common . download ( url )
167163 } )
168164
169165 const msys1Path = `${ common . drive } :\\DevKit64`
@@ -199,8 +195,7 @@ async function installMSYS1(url) {
199195async function installVCPKG ( url ) {
200196 const downloadPath = await common . measure ( 'Downloading mswin vcpkg packages' , async ( ) => {
201197 console . log ( url )
202- const auth = common . inputs . token ? `token ${ common . inputs . token } ` : undefined
203- return await tc . downloadTool ( url , undefined , auth )
198+ return await common . download ( url )
204199 } )
205200
206201 const extractPath = process . env . VCPKG_INSTALLATION_ROOT
0 commit comments