Skip to content

Commit 38ed34f

Browse files
committed
merge code
2 parents e1c3187 + 7ae4dce commit 38ed34f

7 files changed

Lines changed: 7 additions & 11 deletions

File tree

.github/workflows/linux-aarch64.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,3 @@ jobs:
182182
with:
183183
files: |
184184
${{ env.APP_NAME }}-v${{ env.APP_VERSION }}-linux-arm64.tar.xz
185-
${{ env.APP_NAME }}-v${{ env.APP_VERSION }}-linux-arm64-debug.tar.xz

.github/workflows/linux-x86_64.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ on:
2121
default: '--with-php-version=8.2.28'
2222
type: choice
2323
options:
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'
24+
- '--with-php-version=8.1.34'
25+
- '--with-php-version=8.2.30'
26+
- '--with-php-version=8.3.29'
27+
- '--with-php-version=8.4.16'
2828
build_type:
2929
required: true
3030
description: "定制构建选项: 指定构建类型"
@@ -243,4 +243,3 @@ jobs:
243243
with:
244244
files: |
245245
${{ env.APP_NAME }}-v${{ env.APP_VERSION }}-linux-x64.tar.xz
246-
${{ env.APP_NAME }}-v${{ env.APP_VERSION }}-linux-x64-debug.tar.xz

.github/workflows/macos-aarch64.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,4 +172,3 @@ jobs:
172172
with:
173173
files: |
174174
${{ env.APP_NAME }}-v${{ env.APP_VERSION }}-macos-arm64.tar.xz
175-
${{ env.APP_NAME }}-v${{ env.APP_VERSION }}-macos-arm64-debug.tar.xz

.github/workflows/macos-x86_64.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,5 +185,4 @@ jobs:
185185
with:
186186
files: |
187187
${{ env.APP_NAME }}-v${{ env.APP_VERSION }}-macos-x64.tar.xz
188-
${{ env.APP_NAME }}-v${{ env.APP_VERSION }}-macos-x64-debug.tar.xz
189188

sapi/SWOOLE-VERSION.conf

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ MONGODB_VERSION=1.14.2
3636
YAML_VERSION=2.2.2
3737
IMAGICK_VERSION=3.8.0
3838
if [ "${X_PHP_VERSION}" == "8.1" ]; then
39-
SWOOLE_VERSION="v6.1.4"
39+
SWOOLE_VERSION="v6.1.6"
4040
fi
4141
mkdir -p pool/ext
4242
mkdir -p pool/lib

sapi/src/builder/extension/swoole.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
// $swoole_tag = 'v6.0.1';
1212
if (BUILD_CUSTOM_PHP_VERSION_ID == '8010') {
13-
$swoole_tag = 'v6.1.4';
13+
$swoole_tag = 'v6.1.6';
1414
}
1515

1616
$file = "swoole-{$swoole_tag}.tar.gz";

0 commit comments

Comments
 (0)