Skip to content
This repository has been archived by the owner on Jan 17, 2022. It is now read-only.

Commit

Permalink
chore(swoole): Upgrade default tested version to 4.3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
k911 committed Jun 6, 2019
1 parent 44d1c93 commit 0be71fe
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
24 changes: 12 additions & 12 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 2.1
orbs:
codecov: codecov/codecov@1.0.4
codecov: codecov/codecov@1.0.5
aliases:
# Steps
- &prepare-swoole-version-env
Expand Down Expand Up @@ -54,27 +54,27 @@ aliases:
- &docker-compose-build-basic
run:
name: Docker-Compose Build
command: docker-compose build composer
command: docker-compose build --pull composer

- &docker-compose-build-all
run:
name: Docker-Compose Build
command: docker-compose build
command: docker-compose build --pull

- &code-style-analysis
run:
name: Code style analysis
command: docker-compose run composer cs-analyse
command: docker-compose run --rm composer cs-analyse

- &static-src-analysis
run:
name: Sources static analysis
command: docker-compose run composer static-analyse-src
command: docker-compose run --rm composer static-analyse-src

- &static-tests-analysis
run:
name: Test sources static analysis
command: docker-compose run composer static-analyse-tests
command: docker-compose run --rm composer static-analyse-tests

- &prepare-cov-permissions
run:
Expand All @@ -87,27 +87,27 @@ aliases:
- &run-unit-tests
run:
name: Run unit tests
command: docker-compose run composer unit-tests
command: docker-compose run --rm composer unit-tests

- &run-unit-tests-with-coverage
run:
name: Run unit tests with coverage (pcov)
command: docker-compose run coverage-pcov
command: docker-compose run --rm coverage-pcov

- &run-feature-tests
run:
name: Run feature tests
command: docker-compose run composer feature-tests
command: docker-compose run --rm composer feature-tests

- &run-feature-tests-with-coverage-xdebug
run:
name: Run feature tests with coverage (xdebug) and retry
command: docker-compose run coverage-xdebug-feature-with-retry
command: docker-compose run --rm coverage-xdebug-feature-with-retry

- &run-feature-tests-with-coverage-pcov
run:
name: Run feature tests with coverage (pcov)
command: docker-compose run coverage-pcov feature-code-coverage
command: docker-compose run --rm coverage-pcov feature-code-coverage

- &prepare-codeclimate-reporter
run:
Expand All @@ -129,7 +129,7 @@ aliases:
- &merge-code-coverage
run:
name: Merge code coverage files generated across test suites
command: docker-compose run merge-code-coverage
command: docker-compose run --rm merge-code-coverage

- &export-docker-cache
run:
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cache:
env:
global:
- COMPOSER_ARGS=install
- SWOOLE_VERSION=4.3.1
- SWOOLE_VERSION=4.3.4

matrix:
include:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN pecl install xdebug && \
docker-php-ext-enable xdebug

FROM ext-builder as ext-swoole
ARG SWOOLE_VERSION="4.3.1"
ARG SWOOLE_VERSION="4.3.4"
RUN pecl install swoole-${SWOOLE_VERSION} && \
docker-php-ext-enable swoole

Expand Down
12 changes: 6 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
PHP_TAG: "${PHP_VERSION:-7.3}-cli-alpine${ALPINE_VERSION:-3.9}"
PHP_API_VERSION: "${PHP_API_VERSION:-20180731}"
COMPOSER_ARGS: "${COMPOSER_ARGS:-install}"
SWOOLE_VERSION: "${SWOOLE_VERSION:-4.3.1}"
SWOOLE_VERSION: "${SWOOLE_VERSION:-4.3.4}"
ports:
- 9501:9501

Expand All @@ -22,7 +22,7 @@ services:
PHP_TAG: "${PHP_VERSION:-7.3}-cli-alpine${ALPINE_VERSION:-3.9}"
PHP_API_VERSION: "${PHP_API_VERSION:-20180731}"
COMPOSER_ARGS: "${COMPOSER_ARGS:-install}"
SWOOLE_VERSION: "${SWOOLE_VERSION:-4.3.1}"
SWOOLE_VERSION: "${SWOOLE_VERSION:-4.3.4}"

coverage-xdebug:
image: "${REGISTRY:-docker.io}/${NAMESPACE:-k911}/${IMAGE:-swoole-bundle-coverage-xdebug}:${TAG:-latest}"
Expand All @@ -33,7 +33,7 @@ services:
PHP_TAG: "${PHP_VERSION:-7.3}-cli-alpine${ALPINE_VERSION:-3.9}"
PHP_API_VERSION: "${PHP_API_VERSION:-20180731}"
COMPOSER_ARGS: "${COMPOSER_ARGS:-install}"
SWOOLE_VERSION: "${SWOOLE_VERSION:-4.3.1}"
SWOOLE_VERSION: "${SWOOLE_VERSION:-4.3.4}"
volumes:
- "./cov:/usr/src/app/cov"

Expand All @@ -46,7 +46,7 @@ services:
PHP_TAG: "${PHP_VERSION:-7.3}-cli-alpine${ALPINE_VERSION:-3.9}"
PHP_API_VERSION: "${PHP_API_VERSION:-20180731}"
COMPOSER_ARGS: "${COMPOSER_ARGS:-install}"
SWOOLE_VERSION: "${SWOOLE_VERSION:-4.3.1}"
SWOOLE_VERSION: "${SWOOLE_VERSION:-4.3.4}"
volumes:
- "./cov:/usr/src/app/cov"

Expand All @@ -63,7 +63,7 @@ services:
PHP_TAG: "${PHP_VERSION:-7.3}-cli-alpine${ALPINE_VERSION:-3.9}"
PHP_API_VERSION: "${PHP_API_VERSION:-20180731}"
COMPOSER_ARGS: "${COMPOSER_ARGS:-install}"
SWOOLE_VERSION: "${SWOOLE_VERSION:-4.3.1}"
SWOOLE_VERSION: "${SWOOLE_VERSION:-4.3.4}"
volumes:
- "./cov:/usr/src/app/cov"

Expand All @@ -77,7 +77,7 @@ services:
PHP_TAG: "${PHP_VERSION:-7.3}-cli-alpine${ALPINE_VERSION:-3.9}"
PHP_API_VERSION: "${PHP_API_VERSION:-20180731}"
COMPOSER_ARGS: "${COMPOSER_ARGS:-install}"
SWOOLE_VERSION: "${SWOOLE_VERSION:-4.3.1}"
SWOOLE_VERSION: "${SWOOLE_VERSION:-4.3.4}"
volumes:
- "./cov:/usr/src/app/cov:ro"
- "./clover.xml:/usr/src/app/clover.xml"

0 comments on commit 0be71fe

Please sign in to comment.