Skip to content

Commit

Permalink
build-with-choco.ps1: Switching back to force ZEF to skip module inst…
Browse files Browse the repository at this point in the history
…allation tests [--force-test]

reverting 16b30cc
  • Loading branch information
AntonOks committed Nov 29, 2024
1 parent c85e0f5 commit ffb6715
Showing 1 changed file with 13 additions and 3 deletions.
16 changes: 13 additions & 3 deletions tools/build/binary-release/Windows/build-with-choco.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ CheckLastExitCode

cd zef
Write-Host " INFO - Installing ZEF"
& $PrefixPath\bin\raku.exe -I. bin\zef install . --install-to=$PrefixPath\share\perl6\site\ --debug
& $PrefixPath\bin\raku.exe -I. bin\zef install . --debug --force-test --install-to=$PrefixPath\share\perl6\site\
CheckLastExitCode

# Add the required rakudo folders to PATH in order for some modules to test correctly (File::Which)
Expand All @@ -134,12 +134,22 @@ Write-Host " INFO - ZEF: installing `"https://raw.githubusercontent.com/rakudo
& curl.exe -s https://raw.githubusercontent.com/rakudo/star/master/etc/modules.txt --output rakudo-star-modules.txt
CheckLastExitCode

[bool] $readLineDLL = $False
Select-String -Path rakudo-star-modules.txt -Pattern " http "," git " -SimpleMatch | ForEach-Object {
$moduleName, $moduleUrl = ($_.Line -split '\s+')[0,2]
$moduleName = $moduleName.replace("-","::")
Write-Host " INFO - zef: installing $moduleName, $moduleUrl"
Write-Host " INFO - ZEF: installing $moduleName, $moduleUrl"
IF ( $moduleName -ne "zef" ) {
IF ( [string]( & zef install $moduleName --debug --install-to=$PrefixPath\share\perl6\site\) -match 'No candidates found matching identity' ) { & zef install $moduleUrl --debug --install-to=$PrefixPath\share\perl6\site\}

IF ( ("$moduleName" -match "^Terminal") -AND ( -NOT ($readLineDLL) ) ) {
Write-Host " INFO - Copy required `"readline.dll`" from `"https://raw.githubusercontent.com/AntonOks/rakudo_star_module_libs/main/3rdparty/win32/readline/readline.dll`""
& curl.exe -s https://raw.githubusercontent.com/AntonOks/rakudo_star_module_libs/main/3rdparty/win32/readline/readline.dll --output $PrefixPath\bin\readline.dll
$readLineDLL = $True
}

IF ( [string]( & zef install $moduleName --debug --force-test --install-to=$PrefixPath\share\perl6\site\) -match 'No candidates found matching identity' ) {
& zef install $moduleUrl --debug --force-test --install-to=$PrefixPath\share\perl6\site\
}
}
}

Expand Down

0 comments on commit ffb6715

Please sign in to comment.