mirror of
				https://github.com/shivammathur/setup-php.git
				synced 2025-10-31 07:16:22 +07:00 
			
		
		
		
	Skip prestissimo and composer-prefetcher unless composer:v1 is specified
This commit is contained in:
		| @ -222,12 +222,12 @@ Function Get-ToolVersion() { | ||||
|   $version_regex = "[0-9]+((\.{1}[0-9]+)+)(\.{0})(-[a-z0-9]+){0,1}" | ||||
|   if($tool -eq 'composer') { | ||||
|     if ($param -eq 'snapshot') { | ||||
|       $trunk = Select-String -Pattern "const\sBRANCH_ALIAS_VERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern $version_regex | ForEach-Object { $_.matches.Value } | ||||
|       $commit = Select-String -Pattern "const\sVERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern "[a-zA-Z0-9]+" -AllMatches | ForEach-Object { $_.matches[2].Value } | ||||
|       return "$trunk+$commit" | ||||
|       $composer_version = (Select-String -Pattern "const\sBRANCH_ALIAS_VERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern $version_regex | ForEach-Object { $_.matches.Value }) + '+' + (Select-String -Pattern "const\sVERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern "[a-zA-Z0-9]+" -AllMatches | ForEach-Object { $_.matches[2].Value }) | ||||
|     } else { | ||||
|       return Select-String -Pattern "const\sVERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern $version_regex | ForEach-Object { $_.matches.Value } | ||||
|       $composer_version = Select-String -Pattern "const\sVERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern $version_regex | ForEach-Object { $_.matches.Value } | ||||
|     } | ||||
|     Set-Variable -Name 'composer_version' -Value $composer_version -Scope Global | ||||
|     return "$composer_version" | ||||
|   } | ||||
|   return . $tool $param 2> $null | ForEach-Object { $_ -replace "composer $version_regex", '' } | Select-String -Pattern $version_regex | Select-Object -First 1 | ForEach-Object { $_.matches.Value } | ||||
| } | ||||
| @ -310,6 +310,11 @@ Function Add-Composertool() { | ||||
|     [string] | ||||
|     $prefix | ||||
|   ) | ||||
|   if($tool -match "prestissimo|composer-prefetcher" -and $composer_version.split('.')[0] -ne "1") { | ||||
|     Write-Output "::warning:: Skipping $tool, as it does not support Composer $composer_version. Specify composer:v1 in tools to use $tool" | ||||
|     Add-Log $cross $tool "Skipped" | ||||
|     Return | ||||
|   } | ||||
|   composer global require $prefix$release 2>&1 | out-null | ||||
|   $json = findstr $prefix$tool $env:APPDATA\Composer\composer.json | ||||
|   if(Test-Path $composer_bin\composer) { | ||||
|  | ||||
		Reference in New Issue
	
	Block a user
	 Shivam Mathur
					Shivam Mathur