From 16b30cca30ba5f47e49e5542be09693f5ded44ea Mon Sep 17 00:00:00 2001 From: AntonOks Date: Sat, 2 Nov 2024 19:15:16 +0100 Subject: [PATCH] zef: remove the "--force-test" options and switch to "--debug" Changed zef options in "lib/actions/install.bash" and also in "tools/build/binary-release/Windows/build-with-choco.ps1" --- lib/actions/install.bash | 2 +- tools/build/binary-release/Windows/build-with-choco.ps1 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/actions/install.bash b/lib/actions/install.bash index d1183ec..956737c 100644 --- a/lib/actions/install.bash +++ b/lib/actions/install.bash @@ -250,7 +250,7 @@ install_raku_module() { "$RSTAR_PREFIX/bin/raku" -I. bin/zef install . popd > /dev/null else - "$RSTAR_PREFIX/bin/raku" "$RSTAR_PREFIX/share/perl6/site/bin/zef" install --force-test "$1" + "$RSTAR_PREFIX/bin/raku" "$RSTAR_PREFIX/share/perl6/site/bin/zef" install --debug "$1" fi # "$RSTAR_PREFIX/bin/raku" "$BASEDIR/lib/install-module.raku" "$1" diff --git a/tools/build/binary-release/Windows/build-with-choco.ps1 b/tools/build/binary-release/Windows/build-with-choco.ps1 index 42ce8b8..fd8dddc 100644 --- a/tools/build/binary-release/Windows/build-with-choco.ps1 +++ b/tools/build/binary-release/Windows/build-with-choco.ps1 @@ -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\ --error +& $PrefixPath\bin\raku.exe -I. bin\zef install . --install-to=$PrefixPath\share\perl6\site\ --debug CheckLastExitCode # Add the required rakudo folders to PATH in order for some modules to test correctly (File::Which) @@ -139,7 +139,7 @@ Select-String -Path rakudo-star-modules.txt -Pattern " http "," git " -SimpleMat $moduleName = $moduleName.replace("-","::") Write-Host " INFO - zef: installing $moduleName, $moduleUrl" IF ( $moduleName -ne "zef" ) { - IF ( [string]( & zef install $moduleName --debug --install-to=$PrefixPath\share\perl6\site\ --error --force-test) -match 'No candidates found matching identity' ) { & zef install $moduleUrl --debug --install-to=$PrefixPath\share\perl6\site\ --error --force-test} + 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\} } }