diff --git a/.github/workflows/build_rakudo-star.yml b/.github/workflows/build_rakudo-star.yml index 1b8493d..63c5a88 100644 --- a/.github/workflows/build_rakudo-star.yml +++ b/.github/workflows/build_rakudo-star.yml @@ -13,7 +13,7 @@ on: env: GPG_FINGERPRINT: 3E7E3C6EAF916676AC549285A2919382E961E2EE - RAKUDO_FLAVOR: Star + # RAKUDO_FLAVOR: Star jobs: build_Rakudo-Star_Windows_MSI_package: diff --git a/lib/actions/install.bash b/lib/actions/install.bash index 26acc55..d1183ec 100644 --- a/lib/actions/install.bash +++ b/lib/actions/install.bash @@ -204,6 +204,12 @@ build_rakudo() { build_prepare "$BASEDIR/src/rakudo-$VERSION/rakudo-$VERSION" || return + # Set the "RAKUDO_FLAVOR" environment variable to "Star", see + # https://github.com/rakudo/rakudo/commit/6e55b118edcbf60aa0aff875fbcdc21706a782a0 + # https://github.com/rakudo/rakudo/commit/f253d68b8575229f728d4a1d4022291eb469fef9 + # https://github.com/rakudo/rakudo/commit/69a335640ef2803c6f9aae0e65a22516a8ffd0cb + export RAKUDO_FLAVOR="Star" + if [[ -z "$RSTAR_DEBUG" ]] then logfile="$(tmpfile)" diff --git a/tools/build/binary-release/Windows/build-with-choco.ps1 b/tools/build/binary-release/Windows/build-with-choco.ps1 index 9dfb9dd..42ce8b8 100644 --- a/tools/build/binary-release/Windows/build-with-choco.ps1 +++ b/tools/build/binary-release/Windows/build-with-choco.ps1 @@ -11,6 +11,12 @@ param ([string]$RAKUDO_VER, [switch]$sign, [switch]$keep) # https://github.com/microsoft/azure-pipelines-tasks/issues/12799 $ErrorView = 'NormalView' +# Set the "RAKUDO_FLAVOR" environment variable to "Star", see +# https://github.com/rakudo/rakudo/commit/6e55b118edcbf60aa0aff875fbcdc21706a782a0 +# https://github.com/rakudo/rakudo/commit/f253d68b8575229f728d4a1d4022291eb469fef9 +# https://github.com/rakudo/rakudo/commit/69a335640ef2803c6f9aae0e65a22516a8ffd0cb +$env:RAKUDO_FLAVOR="Star" + function CheckLastExitCode { if ($LastExitCode -ne 0) { $msg = @" @@ -133,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 --install-to=$PrefixPath\share\perl6\site\ --error --force-test) -match 'No candidates found matching identity' ) { & zef install $moduleUrl --install-to=$PrefixPath\share\perl6\site\ --error --force-test} + 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} } }