From 0588401ee329a873f99ef3fdd930e6ff7052d12e Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Thu, 30 Apr 2026 11:05:49 +0800 Subject: [PATCH 1/5] Improve GitHub source retrieval by using latest release endpoint and enhancing version handling --- src/SPC/store/Downloader.php | 63 +++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 22 deletions(-) diff --git a/src/SPC/store/Downloader.php b/src/SPC/store/Downloader.php index ccf61dd8..98d9f495 100644 --- a/src/SPC/store/Downloader.php +++ b/src/SPC/store/Downloader.php @@ -98,31 +98,50 @@ class Downloader { logger()->debug("finding {$name} source from github {$type} tarball"); $source['query'] ??= ''; - $data = json_decode(self::curlExec( - url: "https://api.github.com/repos/{$source['repo']}/{$type}{$source['query']}", - hooks: [[CurlHook::class, 'setupGithubToken']], - retries: self::getRetryAttempts() - ), true, 512, JSON_THROW_ON_ERROR); - $url = null; - foreach ($data as $rel) { - if (($rel['prerelease'] ?? false) === true && ($source['prefer-stable'] ?? false)) { - continue; + // Use /releases/latest when possible: it returns the semantically latest stable + // release regardless of publish order, avoiding issues with concurrent release branches. + if ($type === 'releases' && empty($source['query']) && !($source['match'] ?? null)) { + $data = json_decode(self::curlExec( + url: "https://api.github.com/repos/{$source['repo']}/releases/latest", + hooks: [[CurlHook::class, 'setupGithubToken']], + retries: self::getRetryAttempts() + ), true, 512, JSON_THROW_ON_ERROR); + if (!is_array($data) || empty($data['tarball_url'])) { + throw new DownloaderException("failed to find {$name} source"); } - if (($rel['draft'] ?? false) === true && (($source['prefer-stable'] ?? false) || !$rel['tarball_url'])) { - continue; + $url = $data['tarball_url']; + $version = $data['tag_name'] ?? $data['name'] ?? null; + } else { + $data = json_decode(self::curlExec( + url: "https://api.github.com/repos/{$source['repo']}/{$type}{$source['query']}", + hooks: [[CurlHook::class, 'setupGithubToken']], + retries: self::getRetryAttempts() + ), true, 512, JSON_THROW_ON_ERROR); + + $url = null; + $version = null; + foreach ($data as $rel) { + if (($rel['prerelease'] ?? false) === true && ($source['prefer-stable'] ?? false)) { + continue; + } + if (($rel['draft'] ?? false) === true && (($source['prefer-stable'] ?? false) || !$rel['tarball_url'])) { + continue; + } + if (!($source['match'] ?? null)) { + $url = $rel['tarball_url'] ?? null; + $version = $rel['tag_name'] ?? $rel['name'] ?? null; + break; + } + if (preg_match('|' . $source['match'] . '|', $rel['tarball_url'])) { + $url = $rel['tarball_url']; + $version = $rel['tag_name'] ?? $rel['name'] ?? null; + break; + } } - if (!($source['match'] ?? null)) { - $url = $rel['tarball_url'] ?? null; - break; + if (!$url) { + throw new DownloaderException("failed to find {$name} source"); } - if (preg_match('|' . $source['match'] . '|', $rel['tarball_url'])) { - $url = $rel['tarball_url']; - break; - } - } - if (!$url) { - throw new DownloaderException("failed to find {$name} source"); } $headers = self::curlExec( url: $url, @@ -134,7 +153,7 @@ class Downloader if ($matches) { $filename = $matches['filename']; } else { - $filename = "{$name}-" . ($type === 'releases' ? $data['tag_name'] : $data['name']) . '.tar.gz'; + $filename = "{$name}-" . ($version ?? 'latest') . '.tar.gz'; } return [$url, $filename]; From 4eaeeb823012813bb7b0c5c1e791be078bbffc76 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Thu, 30 Apr 2026 11:06:08 +0800 Subject: [PATCH 2/5] Make swoole using `6.2.0` --- config/source.json | 1 - 1 file changed, 1 deletion(-) diff --git a/config/source.json b/config/source.json index 5fbf8c4c..a14ac41a 100644 --- a/config/source.json +++ b/config/source.json @@ -1194,7 +1194,6 @@ "path": "php-src/ext/swoole", "type": "ghtar", "repo": "swoole/swoole-src", - "match": "v6\\.+", "prefer-stable": true, "license": { "type": "file", From 93a227bc6dc4a7a5819b3ca44973abb5c4a8a37c Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Thu, 30 Apr 2026 11:14:01 +0800 Subject: [PATCH 3/5] Fix mongodb 2.3.0 introduced in-tree build bug --- src/SPC/builder/extension/mongodb.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/SPC/builder/extension/mongodb.php b/src/SPC/builder/extension/mongodb.php index 08861e4e..64108d5c 100644 --- a/src/SPC/builder/extension/mongodb.php +++ b/src/SPC/builder/extension/mongodb.php @@ -5,11 +5,22 @@ declare(strict_types=1); namespace SPC\builder\extension; use SPC\builder\Extension; +use SPC\store\FileSystem; use SPC\util\CustomExt; #[CustomExt('mongodb')] class mongodb extends Extension { + public function patchBeforeBuildconf(): bool + { + FileSystem::replaceFileRegex( + SOURCE_PATH . '/php-src/ext/mongodb/config.m4', + '/^(\s+)(src\/libmongoc\/)/m', + '$1${ac_config_dir}/$2' + ); + return true; + } + public function getUnixConfigureArg(bool $shared = false): string { $arg = ' --enable-mongodb' . ($shared ? '=shared' : '') . ' '; From a9e1327a80cc45baa770cbe3a92d5c8f5343dd76 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Thu, 30 Apr 2026 11:22:19 +0800 Subject: [PATCH 4/5] Fix phpunit mock data --- tests/mock/SPC_store.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/mock/SPC_store.php b/tests/mock/SPC_store.php index 99f74fcc..9f9f6f29 100644 --- a/tests/mock/SPC_store.php +++ b/tests/mock/SPC_store.php @@ -12,6 +12,15 @@ use SPC\exception\SPCInternalException; function f_exec(string $command, mixed &$output, mixed &$result_code): bool { $result_code = 0; + if (str_contains($command, 'https://api.github.com/repos/AOMediaCodec/libavif/releases/latest')) { + $output = explode("\n", json_encode([ + 'tag_name' => 'v1.1.1', + 'tarball_url' => 'https://api.github.com/repos/AOMediaCodec/libavif/tarball/v1.1.1', + 'prerelease' => false, + 'draft' => false, + ])); + return true; + } if (str_contains($command, 'https://api.github.com/repos/AOMediaCodec/libavif/releases')) { $output = explode("\n", gzdecode(file_get_contents(__DIR__ . '/../assets/github_api_AOMediaCodec_libavif_releases.json.gz'))); return true; From 7a71a408243c5f312908943a7bc863e744ecbb22 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Thu, 30 Apr 2026 11:22:56 +0800 Subject: [PATCH 5/5] Test --- src/globals/test-extensions.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/globals/test-extensions.php b/src/globals/test-extensions.php index 3d183ae8..6db808f6 100644 --- a/src/globals/test-extensions.php +++ b/src/globals/test-extensions.php @@ -14,7 +14,7 @@ declare(strict_types=1); // test php version (8.1 ~ 8.4 available, multiple for matrix) $test_php_version = [ // '8.1', - // '8.2', + '8.2', // '8.3', // '8.4', '8.5', @@ -50,7 +50,7 @@ $prefer_pre_built = true; // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`). $extensions = match (PHP_OS_FAMILY) { - 'Linux', 'Darwin' => 'gd,imagick', + 'Linux', 'Darwin' => 'swoole,mongodb', 'Windows' => 'bcmath,brotli,bz2,ctype,curl,dom,exif,fileinfo,filter,ftp,gd,iconv,intl,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pdo,pdo_mysql,pdo_pgsql,pgsql,session,simdjson,simplexml,sodium,sqlite3,tokenizer,xml,xmlreader,xmlwriter,zip,zlib', }; @@ -66,7 +66,7 @@ $with_suggested_libs = true; // If you want to test extra libs for extensions, add them below (comma separated, example `libwebp,libavif`). Unnecessary, when $with_suggested_libs is true. $with_libs = match (PHP_OS_FAMILY) { - 'Linux', 'Darwin' => 'libde265', + 'Linux', 'Darwin' => '', 'Windows' => '', };