Apply go_xcaddy patch changes in feat/pgo-v3

This commit is contained in:
crazywhalecc
2026-07-15 12:59:20 +08:00
parent fbbcc80126
commit d6b2b96aa8

View File

@@ -25,7 +25,6 @@ class go_xcaddy
])] ])]
public function downBinary(ArtifactDownloader $downloader): DownloadResult public function downBinary(ArtifactDownloader $downloader): DownloadResult
{ {
$pkgroot = PKG_ROOT_PATH;
$name = SystemTarget::getCurrentPlatformString(); $name = SystemTarget::getCurrentPlatformString();
$arch = match (explode('-', $name)[1]) { $arch = match (explode('-', $name)[1]) {
'x86_64' => 'amd64', 'x86_64' => 'amd64',
@@ -64,7 +63,7 @@ class go_xcaddy
if ($file_hash !== $hash) { if ($file_hash !== $hash) {
throw new DownloaderException("Hash mismatch for downloaded go-xcaddy binary. Expected {$hash}, got {$file_hash}"); throw new DownloaderException("Hash mismatch for downloaded go-xcaddy binary. Expected {$hash}, got {$file_hash}");
} }
return DownloadResult::archive(basename($path), ['url' => $url, 'version' => $version], extract: "{$pkgroot}/go-xcaddy", verified: true, version: $version); return DownloadResult::archive(basename($path), ['url' => $url, 'version' => $version], extract: '{pkg_root_path}/go-xcaddy', verified: true, version: $version);
} }
#[CustomBinaryCheckUpdate('go-xcaddy', [ #[CustomBinaryCheckUpdate('go-xcaddy', [
@@ -109,7 +108,7 @@ class go_xcaddy
'GOROOT' => "{$target_path}", 'GOROOT' => "{$target_path}",
'GOBIN' => "{$target_path}/bin", 'GOBIN' => "{$target_path}/bin",
'GOPATH' => "{$target_path}/go", 'GOPATH' => "{$target_path}/go",
])->exec('CC=cc go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest'); ])->exec('CGO_ENABLED=0 go install github.com/caddyserver/xcaddy/cmd/xcaddy@master');
GlobalEnvManager::addPathIfNotExists("{$target_path}/bin"); GlobalEnvManager::addPathIfNotExists("{$target_path}/bin");
} }
} }