From f9e500ac4ac627f7668873988f12980ad026dd49 Mon Sep 17 00:00:00 2001 From: k911 Date: Wed, 9 Dec 2020 16:00:54 +0100 Subject: [PATCH] ci: upgrade swoole to v4.5.9 --- .travis.yml | 15 +-------------- Dockerfile | 2 +- docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3dfdb12b..3dd15b41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,25 +9,12 @@ cache: env: global: - COMPOSER_ARGS=install - - SWOOLE_VERSION=4.5.8 + - SWOOLE_VERSION=4.5.9 matrix: include: - php: "7.3" - env: - - "COMPOSER_ARGS='update --prefer-lowest'" - - php: "7.3" - - php: "7.3" - env: - - SWOOLE_LATEST=1 - - COMPOSER_ARGS='install --ignore-platform-reqs' - - php: "7.3" - env: - - COMPOSER_ARGS=update - - php: "7.4" - php: "7.4" - env: - - SWOOLE_LATEST=1 - php: "7.4" env: - SWOOLE_LATEST=1 diff --git a/Dockerfile b/Dockerfile index 0208771d..48d2ceb7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ RUN pecl install xdebug && \ FROM ext-builder as ext-swoole RUN apk add --no-cache git -ARG SWOOLE_VERSION="4.5.8" +ARG SWOOLE_VERSION="4.5.9" RUN if $(echo "$SWOOLE_VERSION" | grep -qE '^[4-9]\.[0-9]+\.[0-9]+$'); then SWOOLE_GIT_REF="v$SWOOLE_VERSION"; else SWOOLE_GIT_REF="$SWOOLE_VERSION"; fi && \ git clone https://github.com/swoole/swoole-src.git --branch "$SWOOLE_GIT_REF" --depth 1 && \ cd swoole-src && \ diff --git a/docker-compose.yml b/docker-compose.yml index bda8702d..879bd884 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ x-env-aliases: PHP_TAG: "${PHP_VERSION:-7.4}-cli-alpine${ALPINE_VERSION:-3.12}" PHP_API_VERSION: "${PHP_API_VERSION:-20190902}" COMPOSER_ARGS: "${COMPOSER_ARGS:-install}" - SWOOLE_VERSION: "${SWOOLE_VERSION:-4.5.8}" + SWOOLE_VERSION: "${SWOOLE_VERSION:-4.5.9}" COMPOSER_TAG: "${COMPOSER_TAG:-2.0.7}" volumes: