Skip to content

Commit e56e382

Browse files
jingjingxykmatyhtf
andauthored
pull main source code for v5.1.x (#898)
* 完善 upgrade php version to 8.1.29 (#752) * update * sync php code * update extension swoole code * update setup-php-runtime.sh (#751) * disable swoolg pg test (#755) * disable swoolg pg test * Update linux-x86_64.yml --------- Co-authored-by: Tianfeng.Han <[email protected]> * v6 cygwin 环境禁用 opcache (#760) * 默认下载的 swoole-cli 版本由 v5.13.0 升级为 v5.1.4.0 (#759) * 升级下载 swoole-cli 默认版本为 v5.1.4.0 * update * Feature test swoole pg (#758) * test v6 swoole pdo_pgsql * test * test * update swoole PGSQL Test * Optimize code * Optimize cygwin scripts * fix * Update ext-swoole * add liburing io_uring library (#700) * 更新 quickstart 脚本 (#766) * 更新 quickstart 脚本 * update quickstart script * update quickstart script * 调整 github aciton macos workflow (#764) * 调整 github aciton macos workflow * optimize code * 更新 下载源码包(all-deps.zip) 集合 hash 签名 (#768) * 更新 下载源码包 集合 hash 签名 * update * update sync-source-code.php (#763) * 调整 uuid 扩展 依赖库 命名 (#771) * Optimize gettext * Optimize code. default enable gettext, intl, uuid * Upgrade mongodb to 1.19.4, Fix macOS * Remove gettext, intl, uuid extensions because they cannot be supported on macOS. Optimize directory name. * update extensions.md (#780) * 删除 multistage-build-dependencies-container , 此功能由 build-export-container.sh 脚本代替 (#778) * optimzie * 移除提前构建依赖容器脚本, 此功能由 build-export-container.sh 脚本代替 * fix uuid gettext config error (#776) * update setup php swoole-cli runtime (#784) * update workflow (#772) * dockerfile 和 dockerfile-arm64 合并为一个 (#777) * 使用 tini 正确地回收其子进程 * format bash script * 合并dockerfile dockerfile-arm64 * 自动指定构建容器的架构 * 构建容器指定架构 * 添加 开放原子 容器镜像 解决拉取基础镜像超时 (#767) * 添加 开放原子 容器镜像 解决拉取基础镜像超时 * update * fix script error * update make.sphp * 1. 修复 libxml2, libxslt URL 2. 删除 docker build --progress=plain 参数,非通用参数,部分 docker 版本不支持 3. 修复 PHP 8.4 支持 4. 为 make.sh 添加可执行属性 * Fix mongodb extension build error (#788) * update mongodb extension config * update mongodb extension config * update mongodb extension config * update mongodb extension config * update mongodb extension config * update mongodb extension config * fix readline not work (#802) * Feature optimize code for macOS builder (#792) * optimize code * macos x86_64 with macOS 13 * update macos workflow config * update macos-init.sh * update macos-init.sh * update macos-init.sh * 更新 swoole 至最新 * 修复 macos 编译出错的问题 --filter=[macos-aarch64][macos-x86_64] * 设置 加载 php.ini 默认目录 (#812) * update prepare.php (#813) * Fix sync source code (#798) * fix bug sync-source-code.php * fix bug sync-source-code.php * fix sync-source-code * update sync-source-code.php * fix readline not work * update sync-source-code.php * update sync-source-code.php * update sync-source-code.php * update sync-source-code.php for fpm * update prepare.php * update sync-source-code.php for fpm * update swoole souce code (#833) * update setup-swoole-cli-runtime.sh (#834) * 更新 下载所有依赖包的hash 值 和 升级默认下载的swoole-cli 版本 (#821) * 更新 下载 所有依赖包 hash 值 * update to latest swoole * update to latest swoole version * gd 扩展支持 avif 格式图片 (#815) * gd 扩展支持 avif 格式图片 * gd 扩展支持 avif 格式图片 * update libaom build config * tar-default * update libgav1 build config * update * update libyuv * update svt-av1 build config * update gd extenison config * update library for libavif * update gd config option * update libyuv build config * checkout file composer.lock * workflow show gd extension info * update swoole version * update libyuv download url * update library.php * update to latest swoole version * update test GD extension * update libyuv build config * gd 支持 avif 图片 * gd 支持 avif 图片 * 默认启用xslwriter 扩展 (#838) * format download-box script (#837) * 下载 swoole-cli 运行时 可指定版本 (#842) * 指定下载 swoole-cli 版本 * 指定下载 swoole-cli 版本 * extensions.md add xslwriter (#840) * extensions.md add xslwriter * extensions.md add xslwriter * fix enable xlswriter (#846) * fix download swoole-cli runtime bug (#852) * swoole support zstd (#856) * swoole support zstd * update swoole source code * swoole add depend libzstd * add ZSTD_CFLAGS ZSTD_LIBS * 生成 artifacts hash (#857) * generate artifacts sha256sum * 生成指定版本的 hash * 生成指定版本的 hash * 生成指定版本的 hash * 生成 发版 hash * fix 生成 发版 hash * update generate artifact hash script * update artifact-hash.yaml * optimize generate artifact hash * optimize generate artifact * fix bug (#870) * upgrade swoole version to v6.0.0 (#869) * 使用 curl下载出现错误时,打印错误信息 (#887) * update download-box version (#888) * update install cygwin build environment (#889) * update install cygwin build environment * update windows-cygwin.yml * add runner-images.md * runner-images.md * 为 make.sh 脚本添加 bash 执行引导 * 修复拼写错误和 php warning * 优化 cygwin 构建环境 (#893) * 优化 cygwin 构建环境 * 优化 cygwin 构建环境 * updae install-cygwin.bat * test cygwin make * update cygwin-build.sh * update cygwin-build.sh * update cygwin-build.sh * quickstart linux 运行容器名称与默认保持一致 (#890) * 发版时自动上传到腾讯云对象存储 (#874) * 发版时自动上传到腾讯云对象存储 * optimize workflow upload file to cloud object storage * update * optimize upload cloud object storage * optimize upload to cloud object storage * optimize workflow if condition * update cygwin workflow config * update cygwin workflow config * download all-deps.zip version * update dowonload-cygwin.bat * merge main source code * merge main source code * 更新 获取 github respository 仓库变量 * 更新 获取 github respository 仓库变量 * Feature quickstart fix error and format script code (#897) * update quickstart linux connection container config * format code * update install-docker.sh * update make.php * 细节优化 * update workflow config * fix merge code error --------- Co-authored-by: Tianfeng.Han <[email protected]>
1 parent 9af03c1 commit e56e382

37 files changed

+501
-171
lines changed

.github/workflows/artifact-hash.yml

+17-1
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,17 @@ on:
66
version:
77
required: true
88
description: "发版 版本号 tag"
9-
default: 'v5.1.6.0'
9+
default: 'v6.0.0.0'
1010
type: string
11+
enable_upload_cloud_object_storage:
12+
required: false
13+
type: boolean
14+
description: "上传到云对象存储 (默认不需要上传)"
1115

1216
jobs:
1317
generate-artifact-hash:
1418
runs-on: ubuntu-latest
19+
if: 0
1520
steps:
1621
- uses: actions/checkout@v4
1722
- name: Show Release File Hash
@@ -25,3 +30,14 @@ jobs:
2530
retention-days: 90
2631
path: |
2732
${{ inputs.version }}-sha256sum
33+
34+
- name: upload artifacts to cloud object storage
35+
if: ${{ (github.repository == 'swoole/swoole-cli') && (inputs.enable_upload_cloud_object_storage == true) }}
36+
env:
37+
OSS_SECRET_ID: ${{ secrets.QCLOUD_OSS_SECRET_ID }}
38+
OSS_SECRET_KEY: ${{ secrets.QCLOUD_OSS_SECRET_KEY }}
39+
OSS_BUCKET: ${{ vars.QCLOUD_OSS_BUCKET }}
40+
OSS_REGION: ${{ vars.QCLOUD_OSS_REGION }}
41+
run: |
42+
bash sapi/scripts/tencent-cloud-object-storage.sh --upload-all --swoole-cli-version ${{ inputs.version }}
43+

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
key: source-code-tarball-pool
6262

6363
- name: Clean Source Code Tarball Cache On Release
64-
if: startsWith(github.ref, 'refs/tags/')
64+
if: ${{ startsWith(github.ref, 'refs/tags/') }}
6565
run:
6666
rm -rf ${{ github.workspace }}/pool/*
6767

@@ -100,7 +100,6 @@ jobs:
100100
ls -A pool/ext/
101101
102102
- name: production artifacts
103-
if: 1
104103
uses: actions/upload-artifact@v4
105104
with:
106105
name: all-deps
@@ -111,7 +110,7 @@ jobs:
111110
112111
- name: gh release
113112
uses: softprops/action-gh-release@v2
114-
if: startsWith(github.ref, 'refs/tags/')
113+
if: ${{ startsWith(github.ref, 'refs/tags/') }}
115114
with:
116115
files: |
117116
all-deps.zip

.github/workflows/linux-aarch64.yml

+10
Original file line numberDiff line numberDiff line change
@@ -183,3 +183,13 @@ jobs:
183183
if: startsWith(github.ref, 'refs/tags/')
184184
with:
185185
files: swoole-cli-v${{ env.APP_VERSION }}-linux-arm64.tar.xz
186+
187+
- name: upload artifacts to cloud object storage
188+
if: ${{ (github.repository == 'swoole/swoole-cli') && (startsWith(github.ref, 'refs/tags/')) }}
189+
env:
190+
OSS_SECRET_ID: ${{ secrets.QCLOUD_OSS_SECRET_ID }}
191+
OSS_SECRET_KEY: ${{ secrets.QCLOUD_OSS_SECRET_KEY }}
192+
OSS_BUCKET: ${{ vars.QCLOUD_OSS_BUCKET }}
193+
OSS_REGION: ${{ vars.QCLOUD_OSS_REGION }}
194+
run: |
195+
bash sapi/scripts/tencent-cloud-object-storage.sh --upload-file ${{ github.workspace }}/swoole-cli-v${{ env.APP_VERSION }}-linux-arm64.tar.xz

.github/workflows/linux-x86_64.yml

+10
Original file line numberDiff line numberDiff line change
@@ -165,3 +165,13 @@ jobs:
165165
if: startsWith(github.ref, 'refs/tags/')
166166
with:
167167
files: swoole-cli-v${{ env.APP_VERSION }}-linux-x64.tar.xz
168+
169+
- name: upload artifacts to cloud object storage
170+
if: ${{ (github.repository == 'swoole/swoole-cli') && (startsWith(github.ref, 'refs/tags/')) }}
171+
env:
172+
OSS_SECRET_ID: ${{ secrets.QCLOUD_OSS_SECRET_ID }}
173+
OSS_SECRET_KEY: ${{ secrets.QCLOUD_OSS_SECRET_KEY }}
174+
OSS_BUCKET: ${{ vars.QCLOUD_OSS_BUCKET }}
175+
OSS_REGION: ${{ vars.QCLOUD_OSS_REGION }}
176+
run: |
177+
bash sapi/scripts/tencent-cloud-object-storage.sh --upload-file ${{ github.workspace }}/swoole-cli-v${{ env.APP_VERSION }}-linux-x64.tar.xz

.github/workflows/macos-aarch64.yml

+10
Original file line numberDiff line numberDiff line change
@@ -148,3 +148,13 @@ jobs:
148148
if: startsWith(github.ref, 'refs/tags/')
149149
with:
150150
files: swoole-cli-v${{ env.APP_VERSION }}-macos-arm64.tar.xz
151+
152+
- name: upload artifacts to cloud object storage
153+
if: ${{ (github.repository == 'swoole/swoole-cli') && (startsWith(github.ref, 'refs/tags/')) }}
154+
env:
155+
OSS_SECRET_ID: ${{ secrets.QCLOUD_OSS_SECRET_ID }}
156+
OSS_SECRET_KEY: ${{ secrets.QCLOUD_OSS_SECRET_KEY }}
157+
OSS_BUCKET: ${{ vars.QCLOUD_OSS_BUCKET }}
158+
OSS_REGION: ${{ vars.QCLOUD_OSS_REGION }}
159+
run: |
160+
bash sapi/scripts/tencent-cloud-object-storage.sh --upload-file ${{ github.workspace }}/swoole-cli-v${{ env.APP_VERSION }}-macos-arm64.tar.xz

.github/workflows/macos-x86_64.yml

+10
Original file line numberDiff line numberDiff line change
@@ -148,3 +148,13 @@ jobs:
148148
if: startsWith(github.ref, 'refs/tags/')
149149
with:
150150
files: swoole-cli-v${{ env.APP_VERSION }}-macos-x64.tar.xz
151+
152+
- name: upload artifacts to cloud object storage
153+
if: ${{ (github.repository == 'swoole/swoole-cli') && (startsWith(github.ref, 'refs/tags/')) }}
154+
env:
155+
OSS_SECRET_ID: ${{ secrets.QCLOUD_OSS_SECRET_ID }}
156+
OSS_SECRET_KEY: ${{ secrets.QCLOUD_OSS_SECRET_KEY }}
157+
OSS_BUCKET: ${{ vars.QCLOUD_OSS_BUCKET }}
158+
OSS_REGION: ${{ vars.QCLOUD_OSS_REGION }}
159+
run: |
160+
bash sapi/scripts/tencent-cloud-object-storage.sh --upload-file ${{ github.workspace }}/swoole-cli-v${{ env.APP_VERSION }}-macos-x64.tar.xz

.github/workflows/runner-images.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[runner-images](https://github.com/actions/runner-images/tree/main/images)
2+
3+
[available-images](https://github.com/actions/runner-images?tab=readme-ov-file#available-images)
4+
5+
[choosing-github-hosted-runners](https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#choosing-github-hosted-runners)

.github/workflows/windows-cygwin.yml

+48-5
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,23 @@ on: [ push, pull_request ]
55
jobs:
66
windows-cygwin:
77
if: 1
8-
runs-on: windows-latest
8+
runs-on: windows-2022
99
steps:
10+
- name: Show Environment Info
11+
shell: cmd
12+
run: |
13+
ver
14+
wmic cpu get name, caption, maxclockspeed, status
15+
systeminfo
16+
systeminfo | findstr /B /C:"OS Name" /C:"OS Version"
17+
systeminfo | findstr /B /C:"Manufacturer" /C:"Product" /C:"Version"
18+
set
19+
1020
- name: Prepare git
1121
run: |
1222
git config --global core.autocrlf false
1323
git config --global core.eol lf
24+
git config --global core.ignorecase false
1425
ipconfig
1526
1627
- uses: actions/checkout@v4
@@ -36,25 +47,34 @@ jobs:
3647

3748
- name: Install Cygwin
3849
uses: cygwin/cygwin-install-action@v2
50+
with:
51+
site: https://mirrors.kernel.org/sourceware/cygwin/
3952
# with:
4053
# platform: x64
4154
# packages: make wget tar libtool re2c bison gcc-g++ autoconf automake openssl libpcre2-devel libssl-devel libcurl-devel libxml2-devel libxslt-devel libgmp-devel ImageMagick libpng-devel libjpeg-devel libfreetype-devel libwebp-devel libsqlite3-devel zlib-devel libbz2-devel liblz4-devel liblzma-devel libzip-devel libicu-devel libonig-devel libcares-devel libsodium-devel libyaml-devel libMagick-devel libzstd-devel libbrotli-devel libreadline-devel libintl-devel libpq-devel libssh2-devel libidn2-devel gettext-devel coreutils openssl-devel zip unzip
4255

43-
- name: Install Cygwin Packages
56+
- name: Install Cygwin Packages with bash
57+
if: 0
4458
shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o pipefail -o igncr {0}
4559
run: |
4660
ls -lah /cygdrive/c/
4761
ls -lah /cygdrive/d/
48-
4962
cp -f /cygdrive/c/setup.exe /cygdrive/c/cygwin/bin/setup-x86_64.exe
50-
5163
bash ./sapi/scripts/cygwin/install-cygwin.sh
5264
65+
- name: Install Cygwin Packages
66+
if: 1
67+
run: |
68+
Copy-Item -Path "C:\setup.exe" -Destination "${{ github.workspace }}\setup-x86_64.exe"
69+
cmd /c .\sapi\quickstart\windows\cygwin-build\install-cygwin.bat
70+
5371
- name: Install re2c
72+
shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o pipefail -o igncr {0}
5473
run: |
5574
bash ./sapi/scripts/cygwin/install-re2c.sh
5675
5776
- name: Configure
77+
shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o pipefail -o igncr {0}
5878
run: |
5979
uname -a
6080
# git config --global --add safe.directory /cygdrive/d/a/swoole-cli/swoole-cli
@@ -63,6 +83,7 @@ jobs:
6383
bash ./sapi/scripts/cygwin/cygwin-config.sh
6484
6585
- name: Build
86+
shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o pipefail -o igncr {0}
6687
run: |
6788
bash ./sapi/scripts/cygwin/cygwin-build.sh
6889
@@ -112,8 +133,30 @@ jobs:
112133

113134
- name: gh release
114135
uses: softprops/action-gh-release@v2
115-
if: startsWith(github.ref, 'refs/tags/')
136+
if: ${{ startsWith(github.ref, 'refs/tags/') }}
116137
env:
117138
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
118139
with:
119140
files: swoole-cli-v${{ env.APP_VERSION }}-cygwin-x64.zip
141+
142+
upload-to-cloud-object-storage:
143+
if: 1
144+
runs-on: ubuntu-latest
145+
needs: windows-cygwin
146+
steps:
147+
- name: Prepare Run Environment
148+
run:
149+
sudo apt install -y curl
150+
- uses: actions/checkout@v4
151+
- uses: actions/download-artifact@v4
152+
- name: upload artifacts to cloud object storage
153+
if: ${{ (github.repository == 'swoole/swoole-cli') && (startsWith(github.ref, 'refs/tags/')) }}
154+
env:
155+
OSS_SECRET_ID: ${{ secrets.QCLOUD_OSS_SECRET_ID }}
156+
OSS_SECRET_KEY: ${{ secrets.QCLOUD_OSS_SECRET_KEY }}
157+
OSS_BUCKET: ${{ vars.QCLOUD_OSS_BUCKET }}
158+
OSS_REGION: ${{ vars.QCLOUD_OSS_REGION }}
159+
run: |
160+
FILE_NAME=$(ls -d swoole-cli-v*-cygwin-x64)
161+
FILE="${{ github.workspace }}/${FILE_NAME}/${FILE_NAME}.zip"
162+
bash sapi/scripts/tencent-cloud-object-storage.sh --upload-file ${FILE}

composer.lock

+28-28
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)