Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commiteafbebd

Browse files
committed
Merge remote-tracking branch 'origin/build_native_php' into build_native_php
2 parents01bcfe1 +73e7489 commiteafbebd

File tree

20 files changed

+77
-60
lines changed

20 files changed

+77
-60
lines changed

‎.github/workflows/auto-cache-pool-tarball.yml‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ on:
55
pull_request:
66
schedule:
77
-cron:'0 0 */6 * *'
8+
workflow_dispatch:
89

910
jobs:
1011
auto-cache-pool:
11-
if:1
12+
if:${{ (github.repository_owner == 'swoole') }}
1213
runs-on:ubuntu-latest
1314
steps:
1415
-uses:actions/checkout@v4
@@ -70,7 +71,9 @@ jobs:
7071
set -x
7172
mkdir -p pool/lib
7273
mkdir -p pool/ext
74+
mkdir -p pool/php-tar
7375
mkdir -p bin/runtime
76+
mkdir -p bin/var
7477
if [ ! -f bin/runtime/php ] ; then
7578
bash setup-php-runtime.sh
7679
fi
@@ -84,11 +87,16 @@ jobs:
8487
composer install --no-interaction --no-autoloader --no-scripts --profile --no-dev
8588
composer dump-autoload --optimize --profile --no-dev
8689
87-
php prepare.php +inotify --show-tarball-hash=1
88-
php prepare.php @macos --show-tarball-hash=1
90+
php prepare.php +inotify +apcu +ds +ssh2 +uuid +protobuf +gettext --with-libavif=1 --show-tarball-hash=1
91+
php prepare.php +apcu +ds +ssh2 +uuid +protobuf +gettext --with-libavif=1 --show-tarball-hash=1 @macos
92+
# php sapi/scripts/download-php-src-archive.php
93+
php prepare.php --show-tarball-hash=1 --with-php-version=8.1.32
94+
php prepare.php --show-tarball-hash=1 --with-php-version=8.2.28
95+
php prepare.php --show-tarball-hash=1 --with-php-version=8.3.19
96+
php prepare.php --show-tarball-hash=1 --with-php-version=8.4.5
8997
9098
cd ${{ github.workspace }}/pool/
91-
zip -9 -r ${WORK_DIR}/all-deps.zip ext lib
99+
zip -9 -r ${WORK_DIR}/all-deps.zip ext lib php-tar
92100
HASH=$(sha256sum ${WORK_DIR}/all-deps.zip | awk '{print $1}')
93101
echo " all-deps.zip sha265: ${HASH} "
94102
echo -n ${HASH} > ${WORK_DIR}/all-deps.zip.sha256sum
@@ -98,6 +106,7 @@ jobs:
98106
run:|
99107
ls -A pool/lib/
100108
ls -A pool/ext/
109+
ls -A pool/php-tar/
101110
102111
-name:production artifacts
103112
uses:actions/upload-artifact@v4

‎.github/workflows/linux-aarch64.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: build-php-cli-linux-aarch64
33
on:[ push, pull_request ]
44

55
env:
6-
BUILD_PHP_VERSION:8.2.27
6+
BUILD_PHP_VERSION:8.2.28
77

88
jobs:
99
linux-aarch64:
@@ -12,10 +12,10 @@ jobs:
1212
strategy:
1313
matrix:
1414
php-version:
15-
-"8.2.27"
16-
-"8.1.31"
17-
-"8.3.15"
18-
-"8.4.2"
15+
-"8.2.28"
16+
-"8.1.32"
17+
-"8.3.19"
18+
-"8.4.5"
1919
steps:
2020
-uses:actions/checkout@v4
2121
-name:Show Environment Info

‎.github/workflows/linux-x86_64.yml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@ on:
1818
php_version:
1919
required:true
2020
description:"定制构建选项: 指定 PHP 版本(版本号大于等于8.1)"
21-
default:'--with-php-version=8.2.27'
21+
default:'--with-php-version=8.2.28'
2222
type:choice
2323
options:
24-
-'--with-php-version=8.1.31'
25-
-'--with-php-version=8.2.27'
26-
-'--with-php-version=8.3.15'
24+
-'--with-php-version=8.1.32'
25+
-'--with-php-version=8.2.28'
26+
-'--with-php-version=8.3.19'
27+
-'--with-php-version=8.4.5'
2728
build_type:
2829
required:true
2930
description:"定制构建选项: 指定构建类型"
@@ -39,7 +40,7 @@ on:
3940
type:string
4041

4142
env:
42-
BUILD_PHP_VERSION:8.2.27
43+
BUILD_PHP_VERSION:8.2.28
4344

4445
jobs:
4546
linux-x86_64:
@@ -48,10 +49,10 @@ jobs:
4849
strategy:
4950
matrix:
5051
php-version:
51-
-"8.2.27"
52-
-"8.1.31"
53-
-"8.3.15"
54-
-"8.4.2"
52+
-"8.2.28"
53+
-"8.1.32"
54+
-"8.3.19"
55+
-"8.4.5"
5556
steps:
5657
-uses:actions/checkout@v4
5758
-name:Show Environment Info

‎.github/workflows/macos-aarch64.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: build-php-cli-macos-aarch64
33
on:[ push, pull_request ]
44

55
env:
6-
BUILD_PHP_VERSION:8.2.27
6+
BUILD_PHP_VERSION:8.2.28
77

88
jobs:
99
macos-aarch64:
@@ -17,10 +17,10 @@ jobs:
1717
strategy:
1818
matrix:
1919
php-version:
20-
-"8.2.27"
21-
-"8.1.31"
22-
-"8.3.15"
23-
-"8.4.2"
20+
-"8.2.28"
21+
-"8.1.32"
22+
-"8.3.19"
23+
-"8.4.5"
2424

2525
steps:
2626
-uses:actions/checkout@v4

‎.github/workflows/macos-x86_64.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
pull_request:
66

77
env:
8-
BUILD_PHP_VERSION:8.2.27
8+
BUILD_PHP_VERSION:8.2.28
99

1010
jobs:
1111
macos-x86_64:
@@ -19,10 +19,10 @@ jobs:
1919
strategy:
2020
matrix:
2121
php-version:
22-
-"8.2.27"
23-
-"8.1.31"
24-
-"8.3.15"
25-
-"8.4.2"
22+
-"8.2.28"
23+
-"8.1.32"
24+
-"8.3.19"
25+
-"8.4.5"
2626
steps:
2727
-uses:actions/checkout@v4
2828
-name:Show Environment Info

‎.github/workflows/windows-cygwin.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
pull_request:
66

77
env:
8-
BUILD_PHP_VERSION:8.2.27
8+
BUILD_PHP_VERSION:8.2.28
99

1010
jobs:
1111
windows-cygwin:
@@ -14,10 +14,10 @@ jobs:
1414
strategy:
1515
matrix:
1616
php-version:
17-
-"8.2.27"
18-
-"8.1.31"
19-
-"8.3.15"
20-
-"8.4.2"
17+
-"8.2.28"
18+
-"8.1.32"
19+
-"8.3.19"
20+
-"8.4.5"
2121
steps:
2222
-name:Show Environment Info
2323
shell:cmd

‎bin/.gitkeep‎

Whitespace-only changes.

‎pool/.gitkeep‎

Whitespace-only changes.

‎prepare.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232

3333

3434
# PHP 默认版本 （此文件配置 /sapi/PHP-VERSION.conf 在 build_native_php分支 和 衍生分支 无效）
35-
$php_version ='8.2.27';
36-
$php_version_id ='802027';
37-
$php_version_tag ='php-8.2.27';
35+
$php_version ='8.2.28';
36+
$php_version_id ='802028';
37+
$php_version_tag ='php-8.2.28';
3838

3939
if ($p->getInputOption('with-php-version')) {
4040
$subject =$p->getInputOption('with-php-version');

‎sapi/quickstart/linux/alpine-init.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ apk update
4242

4343
apk add vim alpine-sdk xz autoconf automake linux-headers clang-dev clang lld libtool cmake bison re2c coreutils gcc g++
4444
apk add bash zip unzip flex pkgconf ca-certificates
45-
apk add tar gzip zip unzip bzip2 gettext gettext-dev
45+
apk add tar gzip zip unzip bzip2
46+
apk add gettext gettext-dev
4647

4748
apk add bash 7zip
4849
# apk add bash p7zip
@@ -70,4 +71,3 @@ esac
7071

7172
# pip3 install meson
7273
apk add meson
73-

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp