@@ -358,22 +358,10 @@ async function installCrystalForWindows({crystal, arch = "x86_64", path}) {
358
358
359
359
Core . info ( "Setting up environment for Crystal" ) ;
360
360
const vars = await variablesForVCBuildTools ( ) ;
361
- addPathToVars ( vars , "PATH" , Path . join ( path , "bin" ) ) ;
362
- addPathToVars ( vars , "LIB" , Path . join ( path , "bin" ) ) ;
363
- addPathToVars ( vars , "CRYSTAL_PATH" , Path . join ( path , "src" ) ) ;
364
- addPathToVars ( vars , "CRYSTAL_PATH" , "lib" ) ;
365
361
for ( const [ k , v ] of vars . entries ( ) ) {
366
362
Core . exportVariable ( k , v ) ;
367
363
}
368
- }
369
-
370
- function addPathToVars ( vars , key , value ) {
371
- for ( const [ k , v ] of vars . entries ( ) ) {
372
- if ( k . toLowerCase ( ) === key . toLowerCase ( ) ) {
373
- return vars . set ( k , value + Path . delimiter + v ) ;
374
- }
375
- }
376
- return vars . set ( key , value ) ;
364
+ Core . addPath ( path ) ;
377
365
}
378
366
379
367
const outputSep = "---" ;
@@ -419,28 +407,20 @@ async function downloadCrystalNightlyForWindows() {
419
407
Core . info ( `Found Crystal release ${ workflowRun [ "html_url" ] } ` ) ;
420
408
Core . setOutput ( "crystal" , ref ) ;
421
409
422
- const fetchSrcTask = downloadSource ( { name : "Crystal" , apiBase : GitHubApiBase , ref} ) ;
423
- const fetchExeTask = ( async ( ) => {
424
- const artifactsResp = await githubGet ( {
425
- url : GitHubApiBase + "/actions/runs/:run_id/artifacts" ,
426
- "run_id" : runId ,
427
- } ) ;
428
- const artifact = artifactsResp . data [ "artifacts" ] . find ( ( x ) => x . name === "crystal" ) ;
429
-
430
- Core . info ( "Downloading Crystal build" ) ;
431
- const downloadedPath = await githubDownloadViaRedirect ( {
432
- url : GitHubApiBase + "/actions/artifacts/:artifact_id/zip" ,
433
- "artifact_id" : artifact . id ,
434
- } ) ;
435
-
436
- Core . info ( "Extracting Crystal build" ) ;
437
- return ToolCache . extractZip ( downloadedPath ) ;
438
- } ) ( ) ;
439
-
440
- const path = await fetchSrcTask ;
441
- await IO . rmRF ( Path . join ( path , "bin" ) ) ;
442
- await IO . mv ( await fetchExeTask , Path . join ( path , "bin" ) ) ;
443
- return path ;
410
+ const artifactsResp = await githubGet ( {
411
+ url : GitHubApiBase + "/actions/runs/:run_id/artifacts" ,
412
+ "run_id" : runId ,
413
+ } ) ;
414
+ const artifact = artifactsResp . data [ "artifacts" ] . find ( ( x ) => x . name === "crystal" ) ;
415
+
416
+ Core . info ( "Downloading Crystal build" ) ;
417
+ const downloadedPath = await githubDownloadViaRedirect ( {
418
+ url : GitHubApiBase + "/actions/artifacts/:artifact_id/zip" ,
419
+ "artifact_id" : artifact . id ,
420
+ } ) ;
421
+
422
+ Core . info ( "Extracting Crystal build" ) ;
423
+ return ToolCache . extractZip ( downloadedPath ) ;
444
424
}
445
425
446
426
function githubGet ( request ) {
0 commit comments