Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Experiment 同步主分支 #648

Merged
merged 9 commits into from
Jun 7, 2024
Merged

Experiment 同步主分支 #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
36ca167
update build-release-example.sh
jingjingxyk Jun 6, 2024
1c81928
Merge branch 'feature-macos-arm64' into experiment-webui
jingjingxyk Jun 6, 2024
348404c
github action enable macos arm64 (#610)
jingjingxyk Jun 7, 2024
566a62c
swoole upgrade v5.1.3 (#643)
jingjingxyk Jun 7, 2024
a356514
merge code
jingjingxyk Jun 7, 2024
58b54b8
merge code
jingjingxyk Jun 7, 2024
6b05ba9
merge code
jingjingxyk Jun 7, 2024
625c641
fix swoole dependency libcares (#645)
jingjingxyk Jun 7, 2024
8fa6161
Merge branch 'main' into experiment-webui
jingjingxyk Jun 7, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/macos-aarch64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ jobs:
echo ${CURRENT_USER}
sudo mkdir -p /usr/local/swoole-cli
CURRENT_USER=$(whoami) && sudo chown -R ${CURRENT_USER}:staff /usr/local/swoole-cli

# git submodule update --init

- name: Cache PHP Runtime
Expand Down
12 changes: 8 additions & 4 deletions build-release-example.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ fi

cd ${__PROJECT__}

if [ ! -d ext/swoole/.git ] ; then
git submodule update --init --recursive
fi

set -x

# shellcheck disable=SC2034
Expand Down Expand Up @@ -49,9 +53,9 @@ MIRROR=''

# 依赖库默认安装目录
LIBRARY_INSTALL_PREFIX=/usr/local/swoole-cli

OPTIONS=''


while [ $# -gt 0 ]; do
case "$1" in
--mirror)
Expand Down Expand Up @@ -97,7 +101,7 @@ done
# 构建环境依赖检查
CMDS_NUMS=0
CMDS=("flex" "pkg-config" "cmake" "re2c" "bison" "curl" "automake" "libtool" "clang" "xz" "zip" "unzip" "autoconf")
CMDS_ARRAY_LEN=${#CMDS[@]}
CMDS_LEN=${#CMDS[@]}
for cmd in "${CMDS[@]}"; do
if command -v "$cmd" >/dev/null 2>&1; then
# echo "$cmd exists"
Expand All @@ -108,7 +112,7 @@ done
if [ "$OS" = 'linux' ] ; then
if [ -f /.dockerenv ]; then
IN_DOCKER=1
if test $CMDS_ARRAY_LEN -ne $CMDS_NUMS ;then
if test $CMDS_LEN -ne $CMDS_NUMS ;then
{
if [ "$MIRROR" = 'china' ] ; then
sh sapi/quickstart/linux/alpine-init.sh --mirror china
Expand All @@ -130,7 +134,7 @@ if [ "$OS" = 'linux' ] ; then
fi

if [ "$OS" = 'macos' ] ; then
if test $CMDS_ARRAY_LEN -ne $CMDS_NUMS ; then
if test $CMDS_LEN -ne $CMDS_NUMS ; then
{
if [ "$MIRROR" = 'china' ] ; then
bash sapi/quickstart/macos/macos-init.sh --mirror china
Expand Down
16 changes: 4 additions & 12 deletions sapi/quickstart/setup-php-runtime.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,10 @@ __DIR__=$(
cd "$(dirname "$0")"
pwd
)
if [ -f ${__DIR__}/prepare.php ] ; then
__PROJECT__=$(
cd ${__DIR__}/
pwd
)
else
__PROJECT__=$(
cd ${__DIR__}/../../
pwd
)
fi

__PROJECT__=$(
cd ${__DIR__}/../../
pwd
)
cd ${__PROJECT__}

bash ${__PROJECT__}/setup-php-runtime.sh "$@"
5 changes: 4 additions & 1 deletion sapi/src/builder/extension/swoole.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

return function (Preprocessor $p) {

$swoole_tag = 'v5.1.2';
$swoole_tag = 'v5.1.3';
$file = "swoole-{$swoole_tag}.tar.gz";

$url = "https://github.com/swoole/swoole-src/archive/refs/tags/{$swoole_tag}.tar.gz";
Expand Down Expand Up @@ -46,4 +46,7 @@

$libs = $p->isMacos() ? '-lc++' : ' -lstdc++ ';
$p->withVariable('LIBS', '$LIBS ' . $libs);

$p->withExportVariable('CARES_CFLAGS', '$(pkg-config --cflags --static libcares)');
$p->withExportVariable('CARES_LIBS', '$(pkg-config --libs --static libcares)');
};
Loading