From 2ae5aeb848233dad43ffeec1eeec9fa5d3de75f6 Mon Sep 17 00:00:00 2001 From: Yurun Date: Mon, 10 Jun 2024 08:29:06 +0800 Subject: [PATCH] test --- .github/php.dockerfile | 4 ++-- .github/workflows/ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/php.dockerfile b/.github/php.dockerfile index f327914ae..3bafc6213 100644 --- a/.github/php.dockerfile +++ b/.github/php.dockerfile @@ -18,13 +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) || (./configure --enable-openssl \ + && 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)) && cd - && docker-php-ext-enable swoole \ + --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 index d90e7be15..68b2e3b1d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -355,8 +355,8 @@ jobs: # MacOS Arm64 下需要下面的修复，否则无法编译成功 - name: Fix include run: | - echo | gcc -E -v - - 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