Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/linux-glibc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ jobs:
php prepare.php --with-libavif

sudo apt update
bash ./sapi/scripts/install-deps-on-ubuntu.sh
bash ./ext/swoole/scripts/install-deps-on-ubuntu.sh
sudo bash ./sapi/scripts/install-deps-on-ubuntu.sh
sudo bash ./ext/swoole/scripts/install-deps-on-ubuntu.sh
bash ./sapi/scripts/build-swoole-cli-with-linux-gcc.sh

./bin/swoole-cli -v
Expand Down
2 changes: 1 addition & 1 deletion sapi/SWOOLE-VERSION.conf
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v6.1.3
v6.2.0
2 changes: 2 additions & 0 deletions sapi/quickstart/windows/cygwin-build/install-cygwin.bat
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ set "PACKAGES=%PACKAGES%,libwrap-devel"
set "PACKAGES=%PACKAGES%,libedit-devel"
set "PACKAGES=%PACKAGES%,liblzma-devel"
set "PACKAGES=%PACKAGES%,gettext-devel"
set "PACKAGES=%PACKAGES%,libssh2-devel"



set "OPTIONS=%OPTIONS% --packages %PACKAGES%"
Expand Down
2 changes: 2 additions & 0 deletions sapi/scripts/cygwin/cygwin-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ test -f Makefile && make clean
--enable-brotli \
--enable-zstd \
--enable-swoole-stdext \
--with-swoole-ssh2 \
--enable-swoole-ftp \
--enable-redis \
--with-imagick \
--with-yaml \
Expand Down
2 changes: 2 additions & 0 deletions sapi/scripts/msys2/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ test -f Makefile && make clean
--enable-brotli \
--enable-zstd \
--enable-swoole-stdext \
--with-swoole-ssh2 \
--enable-swoole-ftp \
--enable-redis \
--enable-opcache \
--disable-opcache-jit \
Expand Down
5 changes: 4 additions & 1 deletion sapi/src/builder/extension/swoole.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

return function (Preprocessor $p) {
$libiconv_prefix = ICONV_PREFIX;
$dependentLibraries = ['curl', 'openssl', 'cares', 'zlib', 'brotli', 'nghttp2', 'sqlite3', 'unix_odbc', 'pgsql', 'libzstd'];
$libssh2_prefix = LIBSSH2_PREFIX;
$dependentLibraries = ['curl', 'openssl', 'cares', 'zlib', 'brotli', 'nghttp2', 'sqlite3', 'unix_odbc', 'pgsql', 'libzstd', 'libssh2'];
$dependentExtensions = ['curl', 'openssl', 'sockets', 'mysqlnd', 'pdo'];

$options[] = '--enable-swoole';
Expand All @@ -23,6 +24,8 @@
$options[] = '--enable-brotli';
$options[] = '--enable-zstd';
$options[] = '--enable-swoole-stdext';
$options[] = '--with-swoole-ssh2=' . $libssh2_prefix;
$options[] = '--enable-swoole-ftp';

if ($p->isLinux() && $p->getInputOption('with-iouring')) {
$options[] = '--enable-iouring';
Expand Down
2 changes: 1 addition & 1 deletion sapi/src/builder/library/liburing.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
->withHomePage('https://github.com/axboe/liburing.git')
->withLicense('https://github.com/axboe/liburing/blob/master/COPYING', Library::LICENSE_LGPL)
->withManual('hhttps://github.com/axboe/liburing')
->withUrl('https://github.com/axboe/liburing/archive/refs/tags/liburing-2.6.tar.gz')
->withUrl('https://github.com/axboe/liburing/archive/refs/tags/liburing-2.14.tar.gz')
->withPrefix($liburing_prefix)
->withConfigure(
<<<EOF
Expand Down
5 changes: 5 additions & 0 deletions setup-php-runtime.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ APP_DOWNLOAD_URL="https://github.com/swoole/swoole-cli/releases/download/${VERSI
COMPOSER_DOWNLOAD_URL="https://getcomposer.org/download/latest-stable/composer.phar"
CACERT_DOWNLOAD_URL="https://curl.se/ca/cacert.pem"
PIE_DOWNLOAD_URL="https://github.com/php/pie/releases/download/${PIE_VERSION}/pie.phar"
BOX_DOWNLOAD_URL="https://github.com/box-project/box/releases/latest/download/box.phar"

if [ $OS = 'windows' ]; then
APP_DOWNLOAD_URL="https://github.com/swoole/swoole-cli/releases/download/${VERSION}/${APP_NAME}-${APP_VERSION}-cygwin-${ARCH}.zip"
Expand Down Expand Up @@ -122,6 +123,9 @@ chmod a+x composer.phar
test -f pie.phar || curl -fSLo pie.phar ${PIE_DOWNLOAD_URL}
chmod a+x pie.phar

test -f box.phar || curl -fSLo box.phar ${BOX_DOWNLOAD_URL}
chmod a+x box.phar

test -f cacert.pem || curl -fSLo cacert.pem ${CACERT_DOWNLOAD_URL}

APP_RUNTIME="${APP_NAME}-${APP_VERSION}-${OS}-${ARCH}"
Expand Down Expand Up @@ -149,6 +153,7 @@ cd ${__PROJECT__}/var/runtime
cp -f ${__PROJECT__}/var/runtime/composer.phar ${APP_RUNTIME_DIR}/composer
cp -f ${__PROJECT__}/var/runtime/cacert.pem ${APP_RUNTIME_DIR}/cacert.pem
cp -f ${__PROJECT__}/var/runtime/pie.phar ${APP_RUNTIME_DIR}/pie
cp -f ${__PROJECT__}/var/runtime/box.phar ${APP_RUNTIME_DIR}/box

cat >${APP_RUNTIME_DIR}/php.ini <<EOF
curl.cainfo="${APP_RUNTIME_DIR}/cacert.pem"
Expand Down
Loading