修复测试 (imiphp#703)

* 修复每日测试的 Swoole 编译 * 修复测试 * test * test
NHZEX · Jun 11, 2024 · a07aa62 · a07aa62
1 parent 7cc8518
commit a07aa62
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/.github/php.dockerfile b/.github/php.dockerfile
@@ -8,7 +8,7 @@ ARG SWOOLE_VERSION
 COPY script/ /tmp/script
 
 RUN set -eux \
-    && apt-get update && apt-get -y install procps libpq-dev unzip git libzip-dev libevent-dev libssl-dev libicu-dev libc-ares-dev libcurl4-openssl-dev unixodbc-dev libsqlite3-dev \
+    && apt-get update && apt-get -y install procps libpq-dev unzip git libzip-dev libevent-dev libssl-dev libicu-dev libc-ares-dev libcurl4-openssl-dev unixodbc-dev libsqlite3-dev libbrotli-dev \
     && docker-php-ext-install -j$(nproc) bcmath mysqli pdo_mysql pdo_pgsql pcntl sockets intl zip \
     && (php --ri redis || (pecl install redis && docker-php-ext-enable redis)) \
     && pecl install inotify \
@@ -18,6 +18,13 @@ RUN set -eux \
     && pecl install apcu \
     && docker-php-ext-enable apcu \
     && curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && chmod +x /usr/bin/composer \
-    && curl -L -o swoole.tar.gz https://github.com/swoole/swoole-src/archive/${SWOOLE_VERSION}.tar.gz && mkdir -p swoole && tar -xzf swoole.tar.gz -C swoole --strip-components=1 && rm swoole.tar.gz && cd swoole && ((stat ./make.sh && ./make.sh) || (stat ./scripts/make.sh && ./scripts/make.sh)) && cd - && docker-php-ext-enable swoole \
+    && curl -L -o swoole.tar.gz https://github.com/swoole/swoole-src/archive/${SWOOLE_VERSION}.tar.gz && mkdir -p swoole && tar -xzf swoole.tar.gz -C swoole --strip-components=1 && rm swoole.tar.gz && cd swoole && ((stat ./make.sh && ./make.sh) || (phpize && ./configure --enable-openssl \
+    --enable-sockets \
+    --enable-mysqlnd \
+    --enable-swoole-curl \
+    --enable-cares \
+    --enable-swoole-pgsql \
+    --with-swoole-odbc=unixODBC,/usr \
+    --enable-swoole-sqlite && make -j install)) && cd - && docker-php-ext-enable swoole \
     && bash /tmp/script/swoole_postgresql.sh ${POSTGRESQL_VERSION} \
     && echo "zend_extension=opcache.so" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -355,7 +355,8 @@ jobs:
       # MacOS Arm64 下需要下面的修复，否则无法编译成功
       - name: Fix include
         run: |
-          sudo ln -s $(brew --prefix pcre2)/include/pcre2.h /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/
+          sudo mkdir -p /usr/local/include
+          sudo ln -s $(brew --prefix pcre2)/include/pcre2.h /usr/local/include/
       - name: Get Openssl Dir
         id: opecssl-dir
         run: echo "path=$(brew --prefix openssl@1.1)" >> $GITHUB_OUTPUT

diff --git a/.github/workflows/daily-test.yml b/.github/workflows/daily-test.yml
@@ -6,9 +6,15 @@ on:
   push:
     paths:
       - ".github/workflows/daily-test.yml"
+      - ".github/docker-compose.yml"
+      - ".github/php.dockerfile"
+      - ".github/actions/ci-prepare"
   pull_request:
     paths:
       - ".github/workflows/daily-test.yml"
+      - ".github/docker-compose.yml"
+      - ".github/php.dockerfile"
+      - ".github/actions/ci-prepare"
 
 jobs:
   daily-test-3_0:
@@ -33,8 +39,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          ref: "3.0"
       - name: Cache dependencies
         uses: actions/cache@v4
         with: