From 9649b1a944f2982f05fefa23539de6a185e5026f Mon Sep 17 00:00:00 2001 From: Yurun Date: Mon, 10 Jun 2024 08:23:45 +0800 Subject: [PATCH] test --- .github/php.dockerfile | 9 ++++++++- .github/workflows/ci.yml | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/php.dockerfile b/.github/php.dockerfile index 3c8fbe31b..f327914ae 100644 --- a/.github/php.dockerfile +++ b/.github/php.dockerfile @@ -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) || (./configure --enable-openssl \ + --enable-sockets \ + --enable-mysqlnd \ + --enable-swoole-curl \ + --enable-cares \ + --enable-swoole-pgsql \ + --with-swoole-odbc=unixODBC,/usr \ + --enable-swoole-sqlite)) && 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 index 4090c1433..d90e7be15 100644 --- 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 /opt/homebrew/opt/pcre2/include/ + echo | gcc -E -v - + sudo ln -s $(brew --prefix pcre2)/include/pcre2.h /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ - name: Get Openssl Dir id: opecssl-dir run: echo "path=$(brew --prefix openssl@1.1)" >> $GITHUB_OUTPUT