Skip to content

Commit

Permalink
pull branch main source code
Browse files Browse the repository at this point in the history
  • Loading branch information
jingjingxyk committed Sep 19, 2024
2 parents f263f96 + c58cec7 commit 1dee0ad
Show file tree
Hide file tree
Showing 40 changed files with 356 additions and 599 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linux-aarch64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ jobs:
composer install --no-interaction --no-autoloader --no-scripts --profile
composer dump-autoload --optimize --profile
php prepare.php +inotify +apcu +ds +xlswriter +ssh2 --with-swoole-pgsql=1 --with-libavif=1
php prepare.php
bash make.sh all-library
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux-x86_64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
composer install --no-interaction --no-autoloader --no-scripts --profile
composer dump-autoload --optimize --profile
php prepare.php +inotify +apcu +ds +xlswriter +ssh2 --with-swoole-pgsql=1
php prepare.php
bash ./make.sh all-library
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/macos-aarch64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Prepare build environment
- name: Show Environment Info
run: |
set -x
uname -s
Expand All @@ -24,8 +24,6 @@ jobs:
echo $HOME
brew config
bash sapi/quickstart/macos/macos-init.sh
# sudo rm -rf /Library/Developer/CommandLineTools
# xcode-select --install
Expand All @@ -49,6 +47,10 @@ jobs:
echo "X_IPV6=${IPV6}" >> $GITHUB_ENV
echo "X_IPV4=${IPV4}" >> $GITHUB_ENV
- name: Prepare Build Environment
run: |
bash sapi/quickstart/macos/macos-init.sh
export PATH="/opt/homebrew/opt/libtool/bin:$PATH"
ls -lha /opt/homebrew/opt/libtool/bin/
libtoolize --version
Expand All @@ -60,6 +62,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 Expand Up @@ -97,7 +100,7 @@ jobs:
mkdir -p pool/ext
mkdir -p bin/runtime
if [ ! -f bin/runtime/php ] ; then
bash sapi/quickstart/setup-php-runtime.sh --mirror china
bash sapi/quickstart/setup-php-runtime.sh
fi
bash sapi/download-box/download-box-get-archive-from-server.sh
ls -A pool/lib/
Expand All @@ -111,7 +114,7 @@ jobs:
composer install --no-interaction --no-autoloader --no-scripts --profile
composer dump-autoload --optimize --profile
php prepare.php --without-docker=1 +ds +apcu +xlswriter +ssh2 --with-build-type=release --with-swoole-pgsql=1
php prepare.php --without-docker=1
- name: Build
run: |
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/macos-x86_64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,15 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Prepare build environment
- name: Show Environment Info
run: |
set -x
uname -s
uname -m
uname -r
env
echo $HOME
brew config
set -x
bash sapi/quickstart/macos/macos-init.sh
# sudo rm -rf /Library/Developer/CommandLineTools
# xcode-select --install
Expand All @@ -48,6 +47,10 @@ jobs:
echo "X_IPV6=${IPV6}" >> $GITHUB_ENV
echo "X_IPV4=${IPV4}" >> $GITHUB_ENV
- name: Prepare Build Environment
run: |
bash sapi/quickstart/macos/macos-init.sh
export PATH=/usr/local/opt/libtool/bin:$PATH
ls -lha /usr/local/opt/libtool/bin/
Expand All @@ -59,6 +62,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 Expand Up @@ -110,7 +114,7 @@ jobs:
composer install --no-interaction --no-autoloader --no-scripts --profile
composer dump-autoload --optimize --profile
php prepare.php --without-docker=1 +ds +apcu +xlswriter +ssh2 --with-build-type=release
php prepare.php --without-docker=1
- name: Build
run: |
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ tmp-php.ini
/ext/loader8
/ext/ds
/ext/xlswriter
/ext/uuid
/.phpunit.result.cache
/samples/sfx/*.phar
.php-cs-fixer.cache
Expand Down
1 change: 1 addition & 0 deletions docs/extensions.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
| protobuf |||||
| uuid |||||
| mailparse |||||
| gettext |||||

## 查看 新增的扩展 和 移除的扩展

Expand Down
4 changes: 2 additions & 2 deletions sapi/download-box/download-box-get-archive-from-server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ test -d ${__PROJECT__}/var/download-box/ || mkdir -p ${__PROJECT__}/var/download

cd ${__PROJECT__}/var/download-box/

ALL_DEPS_HASH="5fa1485c2408f05cbc548712917e6dbb8ecd5a631b558d6d512d4a6671f071e5"
ALL_DEPS_HASH="ed854e2116ff663404250152af16d850ed69253079c65ee790538c51a09166dd"

DOMAIN='https://github.com/swoole/swoole-cli/releases/download/v5.1.3.0/'
DOMAIN='https://github.com/swoole/swoole-cli/releases/download/v5.1.4.0/'
while [ $# -gt 0 ]; do
case "$1" in
--mirror)
Expand Down

This file was deleted.

75 changes: 0 additions & 75 deletions sapi/multistage-build-dependencies-container/README.md

This file was deleted.

Loading

0 comments on commit 1dee0ad

Please sign in to comment.