Optimize/workflow add cache (#669)

People-Sea · web-flow · commit 417648e9c01e · 2025-07-27T03:03:30.000+08:00
* optimize(CI): 优化CI工作流，增加 PHP 扩展缓存和 Composer 缓存设置

* fix(workflow): 修正 Swoole 扩展配置，更新 PHP 扩展缓存设置

* fix(workflow): 修正 Swoole 版本号格式，去掉前缀 'v'

* fix(workflow): 使用环境变量 PHP_EXTENSIONS 替代硬编码扩展列表

* fix(workflow): 更新 Composer 缓存键以包含 PHP 和 Swoole 版本信息

* fix(workflow): 修正 Swow 扩展配置，去掉版本号后缀

* fix(workflow): 更新 PHP 和 Swoole 版本至 8.3 和 master，添加缺失的依赖包

* fix(workflow): 添加 execute_install_scripts 参数以执行安装脚本

* fix(workflow): 移动 cache-apt-pkgs-action 步骤至生成 PHP_EXTENSIONS 缓存密钥之后

* fix(workflow): 更新 PHP 和 Swoole 版本至 8.3 和 master，移除不必要的缓存步骤

* fix(workflow): 添加 Swoole 配置以禁用短名称并验证安装

* fix(workflow): 添加 Swoole 配置以启用 Fiber Mock

* fix(workflow): 移除 Swoole 和 Swow 安装步骤中的不必要 APT 包依赖

* 测试不恢复apt 包

* fix(workflow): 移除 Swoole 安装步骤中的 APT 包缓存设置

* fix(workflow): 添加 APT 包缓存设置以优化 Swoole 和 Swow 安装步骤
diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
@@ -2,7 +2,23 @@ name: Code Coverage Upload
 
 on:
   push:
+    paths:
+      - 'app/**'
+      - 'config/**'
+      - 'composer.*'
+      - 'databases/**'
+      - 'tests/**'
+      - '.github/ci/**'
+      - '.github/workflows/code-coverage.yml'
   pull_request:
+    paths:
+      - 'app/**'
+      - 'config/**'
+      - 'composer.*'
+      - 'databases/**'
+      - 'tests/**'
+      - '.github/ci/**'
+      - '.github/workflows/code-coverage.yml'
   schedule:
     - cron: '0 2 * * *'
 
@@ -13,8 +29,8 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        php-version: [ '8.1' ]
-        sw-version: [ 'v5.1.3']
+        php-version: [ '8.3' ]
+        sw-version: [ 'master' ]
         exclude:
           - php-version: '8.3'
             sw-version: 'v5.0.3'
@@ -24,38 +40,35 @@ jobs:
       SW_VERSION: ${{ matrix.sw-version }}
       MYSQL_VERSION: '8.0'
       PGSQL_VERSION: '14'
+      PHP_EXTENSIONS: redis, pdo, pdo_mysql, sqlsrv, pdo_sqlsrv, pdo_odbc, bcmath, swoole-${{ matrix.sw-version }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Upgrade
-        run: |
-          sudo apt-get clean
-          sudo apt-get update
-          sudo apt-get upgrade -f
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-version }}
-          tools: phpize
-          extensions: redis, pdo, pdo_mysql, bcmath
+          extensions: ${{ env.PHP_EXTENSIONS }}
           ini-values: opcache.enable_cli=0
           coverage: xdebug
-      - name: Install Swoole
+      - name: Set Swoole Shortname
         run: |
-          wget https://github.com/swoole/swoole-src/archive/${SW_VERSION}.tar.gz -O swoole.tar.gz
-          mkdir -p swoole
-          tar -xf swoole.tar.gz -C swoole --strip-components=1
-          rm swoole.tar.gz
+          sudo sh -c "echo swoole.use_shortname='Off' >> /etc/php/${{ matrix.php-version }}/cli/conf.d/swoole.ini"
+          php --ri swoole
+          php --ri xdebug
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: echo "composer_cache_dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+      - name: Setup composer cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.composer_cache_dir }}
+          key: ${{ matrix.os }}-php-${{ matrix.php-version }}-swoole-${{ matrix.sw-version }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ matrix.os }}-php-${{ matrix.php-version }}-swoole-${{ matrix.sw-version }}-composer-
       - name: Setup Swoole
         run: |
-          sudo apt-get install libcurl4-openssl-dev libc-ares-dev libpq-dev
-          cd swoole
-          phpize
-          ./configure --enable-openssl --enable-swoole-curl --enable-cares --enable-swoole-pgsql --enable-brotli
-          make -j$(nproc)
-          sudo make install
-          sudo sh -c "echo extension=swoole > /etc/php/${{ matrix.php-version }}/cli/conf.d/swoole.ini"
           sudo sh -c "echo swoole.use_shortname='Off' >> /etc/php/${{ matrix.php-version }}/cli/conf.d/swoole.ini"
+          sudo sh -c "echo 'swoole.enable_fiber_mock=On' >> /etc/php/${{ matrix.php-version }}/cli/conf.d/20-xdebug.ini"
           php --ri swoole
           php --ri xdebug
       - name: Setup Packages
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,13 +22,15 @@ on:
     - cron: '0 2 * * *'
 jobs:
   cs-fix:
-    name: PHP CS Fix on PHP${{ matrix.php-version }} ${{ matrix.swoole }}
+    name: PHP CS Fix on PHP${{ matrix.php-version }} ${{ matrix.sw-version }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        php-version: [ '8.1' ]
-        swoole: [ 'swoole' ]
+        php-version: [ '8.3' ]
+        sw-version: [ 'master' ]
+    env:
+      PHP_EXTENSIONS: redis, pdo, pdo_mysql, sqlsrv, pdo_sqlsrv, pdo_odbc, bcmath, swoole-${{ matrix.sw-version }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -37,17 +39,16 @@ jobs:
         with:
           php-version: '8.1'
           tools: php-cs-fixer
-          extensions: redis, pdo, pdo_mysql, bcmath, ${{ matrix.swoole }}
+          extensions: ${{ env.PHP_EXTENSIONS }}
       - name: Get Composer Cache Directory
         id: composer-cache
-        run: |
-          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v4
+        run: echo "composer_cache_dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+      - name: Setup composer cache
+        uses: actions/cache@v4
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ matrix.php-version }}-composer
-          restore-keys: |
-            ${{ matrix.php-version }}-composer
+          path: ${{ steps.composer-cache.outputs.composer_cache_dir }}
+          key: ${{ matrix.os }}-php-${{ matrix.php-version }}-swoole-${{ matrix.sw-version }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ matrix.os }}-php-${{ matrix.php-version }}-swoole-${{ matrix.sw-version }}-composer-
       - name: Setup Packages
         run: ./.github/ci/requirement.install.sh
       - name: Run CS Fix
@@ -71,20 +72,16 @@ jobs:
       SW_VERSION: ${{ matrix.sw-version }}
       MYSQL_VERSION: '8.0'
       PGSQL_VERSION: '14'
+      PHP_EXTENSIONS: redis, pdo, pdo_mysql, sqlsrv, pdo_sqlsrv, pdo_odbc, bcmath
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Upgrade
-        run: |
-          sudo apt-get clean
-          sudo apt-get update
-          sudo apt-get upgrade -f
       - name: Setup PHP TS
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php-version }}
           tools: phpize
-          extensions: redis, pdo, pdo_mysql,sqlsrv,pdo_sqlsrv,pdo_odbc,bcmath
+          php-version: ${{ matrix.php-version }}
+          extensions: ${{ env.PHP_EXTENSIONS }}
           ini-values: opcache.enable_cli=0
         env:
           phpts: ts
@@ -94,9 +91,13 @@ jobs:
           mkdir -p swoole
           tar -xf swoole.tar.gz -C swoole --strip-components=1
           rm swoole.tar.gz
+      - name: Setup APT Packages Cache
+        uses: awalsh128/cache-apt-pkgs-action@latest
+        with:
+          packages: libcurl4-openssl-dev libc-ares-dev libpq-dev
+          version: 1.0
       - name: Setup Swoole
         run: |
-          sudo apt-get install libcurl4-openssl-dev libc-ares-dev libpq-dev
           cd swoole
           phpize
           ./configure --enable-openssl --enable-swoole-curl --enable-cares --enable-swoole-pgsql --enable-brotli --enable-swoole-thread
@@ -105,6 +106,15 @@ jobs:
           sudo sh -c "echo extension=swoole > /etc/php/${{ matrix.php-version }}/cli/conf.d/swoole.ini"
           sudo sh -c "echo swoole.use_shortname='Off' >> /etc/php/${{ matrix.php-version }}/cli/conf.d/swoole.ini"
           php --ri swoole
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: echo "composer_cache_dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+      - name: Setup composer cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.composer_cache_dir }}
+          key: ${{ matrix.os }}-php-${{ matrix.php-version }}-swoole-${{ matrix.sw-version }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ matrix.os }}-php-${{ matrix.php-version }}-swoole-${{ matrix.sw-version }}-composer-
       - name: Setup Packages
         run: ./.github/ci/requirement.install.sh
       - name: Run PHPStan
@@ -160,14 +170,12 @@ jobs:
       SW_VERSION: ${{ matrix.sw-version }}
       MYSQL_VERSION: '8.0'
       PGSQL_VERSION: '14'
+      PHP_EXTENSIONS: redis, pdo, pdo_mysql, sqlsrv, pdo_sqlsrv, pdo_odbc, bcmath
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Upgrade
+      - name: Update composer.json
         run: |
-          sudo apt-get clean
-          sudo apt-get update
-          sudo apt-get upgrade -f
           COMPOSER_JSON_PATH="composer.json"
           COMPOSER_JSON_CONTENT=$(cat $COMPOSER_JSON_PATH)
           COMPOSER_DATA=$(echo $COMPOSER_JSON_CONTENT | jq 'del(.require["ext-swoole"])')
@@ -179,28 +187,40 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php-version }}
           tools: phpize
-          extensions: redis, pdo, pdo_mysql,sqlsrv,pdo_sqlsrv,pdo_odbc,bcmath
+          php-version: ${{ matrix.php-version }}
+          extensions: ${{ env.PHP_EXTENSIONS }}
           ini-values: opcache.enable_cli=0
       - name: Install Swow
         run: |
           wget https://github.com/swow/swow/archive/${SW_VERSION}.tar.gz -O swow.tar.gz
           mkdir -p swow
           tar -xf swow.tar.gz -C swow --strip-components=1
           rm swow.tar.gz
+      - name: Setup APT Packages Cache
+        uses: awalsh128/cache-apt-pkgs-action@latest
+        with:
+          packages: libcurl4-openssl-dev libc-ares-dev libpq-dev
+          version: 1.0
       - name: Setup Swow
         run: |
-          sudo apt-get install libcurl4-openssl-dev libc-ares-dev libpq-dev
           cd swow/ext
           phpize
           ./configure --enable-openssl --enable-swow-curl --enable-cares --enable-swow-pgsql --enable-brotli
           make && sudo make install
           sudo sh -c "echo extension=swow > /etc/php/${{ matrix.php-version }}/cli/conf.d/swow.ini"
           php --ri swow
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: echo "composer_cache_dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+      - name: Setup composer cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.composer_cache_dir }}
+          key: ${{ matrix.os }}-php-${{ matrix.php-version }}-swow-${{ matrix.sw-version }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ matrix.os }}-php-${{ matrix.php-version }}-swow-${{ matrix.sw-version }}-composer-
       - name: Setup Packages
-        run: | 
-          ./.github/ci/requirement.install.sh
+        run: ./.github/ci/requirement.install.sh
       - name: Run PHPStan
         run: ./.github/ci/run.check.sh
       - name: Setup Services
