diff --git a/.github/workflows/alpine.Dockerfile b/.github/workflows/alpine.Dockerfile index 790cb5be8db..ca4288faf3a 100644 --- a/.github/workflows/alpine.Dockerfile +++ b/.github/workflows/alpine.Dockerfile @@ -5,6 +5,8 @@ FROM hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-dev LABEL maintainer="Swoole Team " version="1.0" license="MIT" +ARG PHP_VERSION + COPY . /opt/www WORKDIR /opt/www @@ -13,7 +15,7 @@ RUN set -ex \ && phpize \ && ./configure --enable-openssl --enable-http2 --enable-swoole-curl --enable-swoole-json \ && make -s -j$(nproc) && make install \ - && echo "extension=swoole.so" > /etc/php7/conf.d/50_swoole.ini \ + && echo "extension=swoole.so" > /etc/php${PHP_VERSION%\.*}/conf.d/50_swoole.ini \ # check && php -v \ && php -m \ diff --git a/.github/workflows/ext.yml b/.github/workflows/ext.yml index 626154e288c..75b88982311 100644 --- a/.github/workflows/ext.yml +++ b/.github/workflows/ext.yml @@ -92,11 +92,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-version: [ '7.3', '7.4' ] - alpine-version: [ '3.9', '3.10', '3.11', '3.12' ] - exclude: - - php-version: '7.3' - alpine-version: '3.12' + php-version: [ '7.4', '8.0' ] + alpine-version: [ '3.11', '3.12', '3.13', '3.14' ] max-parallel: 8 fail-fast: false steps: