Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

修复测试 #703

Merged
merged 4 commits into from
Jun 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .github/php.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected])" >> $GITHUB_OUTPUT
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/daily-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -33,8 +39,6 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: "3.0"
- name: Cache dependencies
uses: actions/cache@v4
with:
Expand Down
Loading