set "RAKUDO_FLAVOR" to "Star" in the build tools

Set the environment variable "RAKUDO_FLAVOR" in the RSTAR tool (install.bash) and also in the build-with-choco.ps1 tool and disable it in GitHub actions
rakudo · Jun 23, 2024 · f734c2c · f734c2c
1 parent 389f5f9
commit f734c2c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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}
   }
 }