Skip to content

Commit e1c3187

Browse files
committed
Merge branch 'build_native_php' into php-fpm
2 parents cb86856 + 1220a7f commit e1c3187

14 files changed

Lines changed: 50 additions & 34 deletions

.github/workflows/linux-aarch64.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
strategy:
1313
matrix:
1414
php-version:
15-
- "8.2.29"
16-
- "8.1.33"
17-
- "8.3.28"
18-
- "8.4.15"
15+
- "8.2.30"
16+
- "8.1.34"
17+
- "8.3.29"
18+
- "8.4.16"
1919
# - "8.5.0"
2020
steps:
2121
- uses: actions/checkout@v4
@@ -127,6 +127,7 @@ jobs:
127127
128128
sh sapi/quickstart/linux/alpine-init.sh
129129
git config --global --add safe.directory /work
130+
130131
composer install --no-interaction --no-autoloader --no-scripts --profile --no-dev
131132
composer dump-autoload --optimize --profile --no-dev
132133

.github/workflows/linux-x86_64.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ jobs:
4949
strategy:
5050
matrix:
5151
php-version:
52-
- "8.2.29"
53-
- "8.1.33"
54-
- "8.3.28"
55-
- "8.4.15"
52+
- "8.2.30"
53+
- "8.1.34"
54+
- "8.3.29"
55+
- "8.4.16"
5656
# - "8.5.0"
5757
steps:
5858
- uses: actions/checkout@v4
@@ -180,6 +180,7 @@ jobs:
180180
181181
sh sapi/quickstart/linux/alpine-init.sh
182182
git config --global --add safe.directory /work
183+
183184
composer install --no-interaction --no-autoloader --no-scripts --profile --no-dev
184185
composer dump-autoload --optimize --profile --no-dev
185186

.github/workflows/macos-aarch64.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
strategy:
1717
matrix:
1818
php-version:
19-
- "8.2.29"
20-
- "8.1.33"
21-
- "8.3.28"
22-
- "8.4.15"
19+
- "8.2.30"
20+
- "8.1.34"
21+
- "8.3.29"
22+
- "8.4.16"
2323
# - "8.5.0"
2424
steps:
2525
- uses: actions/checkout@v4

.github/workflows/macos-x86_64.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
strategy:
2020
matrix:
2121
php-version:
22-
- "8.2.29"
23-
- "8.1.33"
24-
- "8.3.28"
25-
- "8.4.15"
22+
- "8.2.30"
23+
- "8.1.34"
24+
- "8.3.29"
25+
- "8.4.16"
2626
# - "8.5.0"
2727
steps:
2828
- uses: actions/checkout@v4

.github/workflows/windows-cygwin.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
strategy:
1515
matrix:
1616
php-version:
17-
- "8.2.29"
18-
- "8.1.33"
19-
- "8.3.28"
20-
- "8.4.15"
17+
- "8.2.30"
18+
- "8.1.34"
19+
- "8.3.29"
20+
- "8.4.16"
2121
# - "8.5.0"
2222
steps:
2323
- name: Show Environment Info

.github/workflows/windows-msys2.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
strategy:
1515
matrix:
1616
php-version:
17-
- "8.2.29"
18-
# - "8.1.33"
19-
- "8.3.28"
20-
- "8.4.15"
17+
- "8.2.30"
18+
# - "8.1.34"
19+
- "8.3.29"
20+
- "8.4.16"
2121
# - "8.5.0"
2222
steps:
2323
- name: Show Environment Info
@@ -143,7 +143,7 @@ jobs:
143143
- uses: actions/checkout@v4
144144
- uses: actions/download-artifact@v4
145145
- name: upload artifacts to cloud object storage
146-
if: ${{ (github.repository == 'swoole/swoole-cli') && (startsWith(github.ref, 'refs/tags/')) }}
146+
if: ${{ 0 && (github.repository == 'swoole/swoole-cli') && (startsWith(github.ref, 'refs/tags/')) }}
147147
env:
148148
OSS_SECRET_ID: ${{ secrets.QCLOUD_OSS_SECRET_ID }}
149149
OSS_SECRET_KEY: ${{ secrets.QCLOUD_OSS_SECRET_KEY }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,7 @@ tmp-php.ini
315315
/ext/ds
316316
/ext/xlswriter
317317
/ext/uuid
318+
/ext/phpy
318319
/.phpunit.result.cache
319320
/samples/sfx/*.phar
320321
.php-cs-fixer.cache

sapi/SWOOLE-VERSION.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v6.1.4
1+
v6.1.5

sapi/scripts/build-swoole-cli-with-linux-gcc.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fi
3535
--enable-exif \
3636
--with-sodium \
3737
--enable-xml --enable-simplexml --enable-xmlreader --enable-xmlwriter --enable-dom --with-libxml \
38-
--enable-gd --with-jpeg --with-freetype \
38+
--enable-gd --with-jpeg --with-freetype --with-avif \
3939
--enable-swoole \
4040
--enable-swoole-curl \
4141
--enable-cares \
@@ -50,6 +50,7 @@ fi
5050
--with-imagick \
5151
--with-yaml \
5252
--with-readline \
53+
--enable-phpy --with-python-config=python3-config \
5354
--enable-opcache
5455

5556
make -j "$(nproc)"

sapi/scripts/cygwin/cygwin-config-ext.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ REDIS_VERSION=6.2.0
3535
MONGODB_VERSION=1.14.2
3636
YAML_VERSION=2.2.2
3737
IMAGICK_VERSION=3.8.0
38-
38+
if [ "${X_PHP_VERSION}" == "8.1" ]; then
39+
SWOOLE_VERSION="v6.1.4"
40+
fi
3941
mkdir -p pool/ext
4042
mkdir -p pool/lib
4143
mkdir -p pool/php-tar

0 commit comments

Comments
 (0)