Skip to content

Commit

Permalink
pull main source code for v5.1.x (#898)
Browse files Browse the repository at this point in the history
* 完善 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 <rango@swoole.com>

* 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 <rango@swoole.com>
  • Loading branch information
jingjingxyk and matyhtf authored Dec 31, 2024
1 parent 9af03c1 commit e56e382
Show file tree
Hide file tree
Showing 37 changed files with 501 additions and 171 deletions.
18 changes: 17 additions & 1 deletion .github/workflows/artifact-hash.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,17 @@ on:
version:
required: true
description: "发版 版本号 tag"
default: 'v5.1.6.0'
default: 'v6.0.0.0'
type: string
enable_upload_cloud_object_storage:
required: false
type: boolean
description: "上传到云对象存储 (默认不需要上传)"

jobs:
generate-artifact-hash:
runs-on: ubuntu-latest
if: 0
steps:
- uses: actions/checkout@v4
- name: Show Release File Hash
Expand All @@ -25,3 +30,14 @@ jobs:
retention-days: 90
path: |
${{ inputs.version }}-sha256sum
- name: upload artifacts to cloud object storage
if: ${{ (github.repository == 'swoole/swoole-cli') && (inputs.enable_upload_cloud_object_storage == true) }}
env:
OSS_SECRET_ID: ${{ secrets.QCLOUD_OSS_SECRET_ID }}
OSS_SECRET_KEY: ${{ secrets.QCLOUD_OSS_SECRET_KEY }}
OSS_BUCKET: ${{ vars.QCLOUD_OSS_BUCKET }}
OSS_REGION: ${{ vars.QCLOUD_OSS_REGION }}
run: |
bash sapi/scripts/tencent-cloud-object-storage.sh --upload-all --swoole-cli-version ${{ inputs.version }}
5 changes: 2 additions & 3 deletions .github/workflows/auto-cache-pool-tarball.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
key: source-code-tarball-pool

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

Expand Down Expand Up @@ -100,7 +100,6 @@ jobs:
ls -A pool/ext/
- name: production artifacts
if: 1
uses: actions/upload-artifact@v4
with:
name: all-deps
Expand All @@ -111,7 +110,7 @@ jobs:
- name: gh release
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
if: ${{ startsWith(github.ref, 'refs/tags/') }}
with:
files: |
all-deps.zip
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/linux-aarch64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,3 +183,13 @@ jobs:
if: startsWith(github.ref, 'refs/tags/')
with:
files: swoole-cli-v${{ env.APP_VERSION }}-linux-arm64.tar.xz

- name: upload artifacts to cloud object storage
if: ${{ (github.repository == 'swoole/swoole-cli') && (startsWith(github.ref, 'refs/tags/')) }}
env:
OSS_SECRET_ID: ${{ secrets.QCLOUD_OSS_SECRET_ID }}
OSS_SECRET_KEY: ${{ secrets.QCLOUD_OSS_SECRET_KEY }}
OSS_BUCKET: ${{ vars.QCLOUD_OSS_BUCKET }}
OSS_REGION: ${{ vars.QCLOUD_OSS_REGION }}
run: |
bash sapi/scripts/tencent-cloud-object-storage.sh --upload-file ${{ github.workspace }}/swoole-cli-v${{ env.APP_VERSION }}-linux-arm64.tar.xz
10 changes: 10 additions & 0 deletions .github/workflows/linux-x86_64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -165,3 +165,13 @@ jobs:
if: startsWith(github.ref, 'refs/tags/')
with:
files: swoole-cli-v${{ env.APP_VERSION }}-linux-x64.tar.xz

- name: upload artifacts to cloud object storage
if: ${{ (github.repository == 'swoole/swoole-cli') && (startsWith(github.ref, 'refs/tags/')) }}
env:
OSS_SECRET_ID: ${{ secrets.QCLOUD_OSS_SECRET_ID }}
OSS_SECRET_KEY: ${{ secrets.QCLOUD_OSS_SECRET_KEY }}
OSS_BUCKET: ${{ vars.QCLOUD_OSS_BUCKET }}
OSS_REGION: ${{ vars.QCLOUD_OSS_REGION }}
run: |
bash sapi/scripts/tencent-cloud-object-storage.sh --upload-file ${{ github.workspace }}/swoole-cli-v${{ env.APP_VERSION }}-linux-x64.tar.xz
10 changes: 10 additions & 0 deletions .github/workflows/macos-aarch64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,3 +148,13 @@ jobs:
if: startsWith(github.ref, 'refs/tags/')
with:
files: swoole-cli-v${{ env.APP_VERSION }}-macos-arm64.tar.xz

- name: upload artifacts to cloud object storage
if: ${{ (github.repository == 'swoole/swoole-cli') && (startsWith(github.ref, 'refs/tags/')) }}
env:
OSS_SECRET_ID: ${{ secrets.QCLOUD_OSS_SECRET_ID }}
OSS_SECRET_KEY: ${{ secrets.QCLOUD_OSS_SECRET_KEY }}
OSS_BUCKET: ${{ vars.QCLOUD_OSS_BUCKET }}
OSS_REGION: ${{ vars.QCLOUD_OSS_REGION }}
run: |
bash sapi/scripts/tencent-cloud-object-storage.sh --upload-file ${{ github.workspace }}/swoole-cli-v${{ env.APP_VERSION }}-macos-arm64.tar.xz
10 changes: 10 additions & 0 deletions .github/workflows/macos-x86_64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,3 +148,13 @@ jobs:
if: startsWith(github.ref, 'refs/tags/')
with:
files: swoole-cli-v${{ env.APP_VERSION }}-macos-x64.tar.xz

- name: upload artifacts to cloud object storage
if: ${{ (github.repository == 'swoole/swoole-cli') && (startsWith(github.ref, 'refs/tags/')) }}
env:
OSS_SECRET_ID: ${{ secrets.QCLOUD_OSS_SECRET_ID }}
OSS_SECRET_KEY: ${{ secrets.QCLOUD_OSS_SECRET_KEY }}
OSS_BUCKET: ${{ vars.QCLOUD_OSS_BUCKET }}
OSS_REGION: ${{ vars.QCLOUD_OSS_REGION }}
run: |
bash sapi/scripts/tencent-cloud-object-storage.sh --upload-file ${{ github.workspace }}/swoole-cli-v${{ env.APP_VERSION }}-macos-x64.tar.xz
5 changes: 5 additions & 0 deletions .github/workflows/runner-images.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[runner-images](https://github.com/actions/runner-images/tree/main/images)

[available-images](https://github.com/actions/runner-images?tab=readme-ov-file#available-images)

[choosing-github-hosted-runners](https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#choosing-github-hosted-runners)
53 changes: 48 additions & 5 deletions .github/workflows/windows-cygwin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,23 @@ on: [ push, pull_request ]
jobs:
windows-cygwin:
if: 1
runs-on: windows-latest
runs-on: windows-2022
steps:
- name: Show Environment Info
shell: cmd
run: |
ver
wmic cpu get name, caption, maxclockspeed, status
systeminfo
systeminfo | findstr /B /C:"OS Name" /C:"OS Version"
systeminfo | findstr /B /C:"Manufacturer" /C:"Product" /C:"Version"
set
- name: Prepare git
run: |
git config --global core.autocrlf false
git config --global core.eol lf
git config --global core.ignorecase false
ipconfig
- uses: actions/checkout@v4
Expand All @@ -36,25 +47,34 @@ jobs:

- name: Install Cygwin
uses: cygwin/cygwin-install-action@v2
with:
site: https://mirrors.kernel.org/sourceware/cygwin/
# with:
# platform: x64
# 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

- name: Install Cygwin Packages
- name: Install Cygwin Packages with bash
if: 0
shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o pipefail -o igncr {0}
run: |
ls -lah /cygdrive/c/
ls -lah /cygdrive/d/
cp -f /cygdrive/c/setup.exe /cygdrive/c/cygwin/bin/setup-x86_64.exe
bash ./sapi/scripts/cygwin/install-cygwin.sh
- name: Install Cygwin Packages
if: 1
run: |
Copy-Item -Path "C:\setup.exe" -Destination "${{ github.workspace }}\setup-x86_64.exe"
cmd /c .\sapi\quickstart\windows\cygwin-build\install-cygwin.bat
- name: Install re2c
shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o pipefail -o igncr {0}
run: |
bash ./sapi/scripts/cygwin/install-re2c.sh
- name: Configure
shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o pipefail -o igncr {0}
run: |
uname -a
# git config --global --add safe.directory /cygdrive/d/a/swoole-cli/swoole-cli
Expand All @@ -63,6 +83,7 @@ jobs:
bash ./sapi/scripts/cygwin/cygwin-config.sh
- name: Build
shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o pipefail -o igncr {0}
run: |
bash ./sapi/scripts/cygwin/cygwin-build.sh
Expand Down Expand Up @@ -112,8 +133,30 @@ jobs:

- name: gh release
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
if: ${{ startsWith(github.ref, 'refs/tags/') }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
files: swoole-cli-v${{ env.APP_VERSION }}-cygwin-x64.zip

upload-to-cloud-object-storage:
if: 1
runs-on: ubuntu-latest
needs: windows-cygwin
steps:
- name: Prepare Run Environment
run:
sudo apt install -y curl
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
- name: upload artifacts to cloud object storage
if: ${{ (github.repository == 'swoole/swoole-cli') && (startsWith(github.ref, 'refs/tags/')) }}
env:
OSS_SECRET_ID: ${{ secrets.QCLOUD_OSS_SECRET_ID }}
OSS_SECRET_KEY: ${{ secrets.QCLOUD_OSS_SECRET_KEY }}
OSS_BUCKET: ${{ vars.QCLOUD_OSS_BUCKET }}
OSS_REGION: ${{ vars.QCLOUD_OSS_REGION }}
run: |
FILE_NAME=$(ls -d swoole-cli-v*-cygwin-x64)
FILE="${{ github.workspace }}/${FILE_NAME}/${FILE_NAME}.zip"
bash sapi/scripts/tencent-cloud-object-storage.sh --upload-file ${FILE}
56 changes: 28 additions & 28 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e56e382

Please sign in to comment.