crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-07-09 01:45:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

[v3] Add musl-wrapper and musl-toolchain installation support (#984)

Browse Source
This commit is contained in:
Jerry Ma
2025-12-05 15:32:32 +08:00
committed by GitHub
parent 93a697ebbf
commit 106b55d4e7
5 changed files with 71 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/StaticPHP/Artifact/ArtifactDownloader.php
View File

@@ -320,7 +320,7 @@ class ArtifactDownloader
$skipped = [];
foreach ($this->artifacts as $artifact) {
++$current;
if ($this->downloadWithType($artifact, $current, $count) === SPC_DOWNLOAD_STATUS_SKIPPED) {
if ($this->downloadWithType($artifact, $current, $count, interactive: $interactive) === SPC_DOWNLOAD_STATUS_SKIPPED) {
$skipped[] = $artifact->getName();
continue;
}
@@ -358,7 +358,7 @@ class ArtifactDownloader
return $this->options[$name] ?? $default;
}
private function downloadWithType(Artifact $artifact, int $current, int $total, bool $parallel = false): int
private function downloadWithType(Artifact $artifact, int $current, int $total, bool $parallel = false, bool $interactive = true): int
{
$queue = $this->generateQueue($artifact);
// already downloaded
@@ -379,7 +379,7 @@ class ArtifactDownloader
};
$try_h = $try ? 'Try downloading' : 'Downloading';
logger()->info("{$try_h} artifact '{$artifact->getName()}' {$item['display']} ...");
if ($parallel === false) {
if ($parallel === false && $interactive) {
InteractiveTerm::indicateProgress("[{$current}/{$total}] Downloading artifact " . ConsoleColor::green($artifact->getName()) . " {$item['display']} from {$type_display_name} ...");
}
// is valid download type
@@ -413,13 +413,13 @@ class ArtifactDownloader
}
// process lock
ApplicationContext::get(ArtifactCache::class)->lock($artifact, $item['lock'], $lock, SystemTarget::getCurrentPlatformString());
if ($parallel === false) {
if ($parallel === false && $interactive) {
$ver = $lock->hasVersion() ? (' (' . ConsoleColor::yellow($lock->version) . ')') : '';
InteractiveTerm::finish('Downloaded ' . ($verified ? 'and verified ' : '') . 'artifact ' . ConsoleColor::green($artifact->getName()) . $ver . " {$item['display']} .");
}
return SPC_DOWNLOAD_STATUS_SUCCESS;
} catch (DownloaderException|ExecutionException $e) {
if ($parallel === false) {
if ($parallel === false && $interactive) {
InteractiveTerm::finish("Download artifact {$artifact->getName()} {$item['display']} failed !", false);
InteractiveTerm::error("Failed message: {$e->getMessage()}", true);
}

13
src/StaticPHP/Artifact/ArtifactExtractor.php
View File

@@ -78,12 +78,17 @@ class ArtifactExtractor
/**
* Extract a single artifact.
*
* @param Artifact $artifact The artifact to extract
* @param bool $force_source If true, always extract source (ignore binary)
* @param Artifact|string $artifact The artifact to extract
* @param bool $force_source If true, always extract source (ignore binary)
*/
public function extract(Artifact $artifact, bool $force_source = false): int
public function extract(Artifact|string $artifact, bool $force_source = false): int
{
$name = $artifact->getName();
if (is_string($artifact)) {
$name = $artifact;
$artifact = ArtifactLoader::getArtifactInstance($name);
} else {
$name = $artifact->getName();
}
// Already extracted in this session
if (isset($this->extracted[$name])) {