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

Commit

Permalink
ci(circle): run tests on php 8.0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
k911 committed Jan 3, 2021
1 parent f0c1162 commit 37f4c3d
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 24 deletions.
76 changes: 55 additions & 21 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,12 @@ jobs:
docker:
- image: docker.io/k911/swoole-bundle-composer:7.4-latest-$CIRCLE_SHA1

swoole-bundle-composer-dev-code-style:
swoole-bundle-composer-80-latest-code-style:
<<: *job-composer-code-style
environment:
PHP_CS_FIXER_IGNORE_ENV: "1"
docker:
- image: docker.io/k911/swoole-bundle-composer:7.4-dev-$CIRCLE_SHA1
- image: docker.io/k911/swoole-bundle-composer:8.0-latest-$CIRCLE_SHA1

swoole-bundle-composer-74-unit-tests:
<<: *job-composer-unit-tests
Expand All @@ -149,10 +151,10 @@ jobs:
docker:
- image: docker.io/k911/swoole-bundle-composer:7.4-latest-$CIRCLE_SHA1

swoole-bundle-composer-dev-unit-tests:
swoole-bundle-composer-80-latest-unit-tests:
<<: *job-composer-unit-tests
docker:
- image: docker.io/k911/swoole-bundle-composer:7.4-dev-$CIRCLE_SHA1
- image: docker.io/k911/swoole-bundle-composer:8.0-latest-$CIRCLE_SHA1

swoole-bundle-composer-74-latest-feature-tests:
<<: *job-composer-feature-tests
Expand All @@ -164,10 +166,10 @@ jobs:
docker:
- image: docker.io/k911/swoole-bundle-composer:7.3-lowest-$CIRCLE_SHA1

swoole-bundle-composer-dev-feature-tests:
swoole-bundle-composer-80-latest-feature-tests:
<<: *job-composer-feature-tests
docker:
- image: docker.io/k911/swoole-bundle-composer:7.4-dev-$CIRCLE_SHA1
- image: docker.io/k911/swoole-bundle-composer:8.0-latest-$CIRCLE_SHA1

swoole-bundle-74-code-coverage:
executor: k911-docker-client
Expand Down Expand Up @@ -259,7 +261,7 @@ jobs:
docker-buildx-bake-73-lowest:
<<: *docker-bake
environment:
PHP_VERSION: 7.3
PHP_VERSION: "7.3"
PHP_API_VERSION: "20180731"
COMPOSER_ARGS: update --prefer-lowest
REGISTRY: docker.io
Expand All @@ -271,7 +273,7 @@ jobs:
docker-buildx-bake-74:
<<: *docker-bake
environment:
PHP_VERSION: 7.4
PHP_VERSION: "7.4"
PHP_API_VERSION: "20190902"
REGISTRY: docker.io
NAMESPACE: k911
Expand All @@ -281,7 +283,7 @@ jobs:
docker-buildx-bake-74-latest:
<<: *docker-bake
environment:
PHP_VERSION: 7.4
PHP_VERSION: "7.4"
PHP_API_VERSION: "20190902"
COMPOSER_ARGS: update --ignore-platform-reqs
SWOOLE_VERSION: latest
Expand All @@ -291,18 +293,18 @@ jobs:
SERVICES: composer
BUILD_TYPE: latest

docker-buildx-bake-dev:
docker-buildx-bake-80-latest:
<<: *docker-bake
environment:
PHP_VERSION: 7.4 # TODO: 8.0.8beta4
PHP_API_VERSION: "20190902"
PHP_VERSION: "8.0"
PHP_API_VERSION: "20200930"
COMPOSER_ARGS: update --ignore-platform-reqs
SWOOLE_VERSION: master
SWOOLE_VERSION: latest
REGISTRY: docker.io
NAMESPACE: k911
IMAGE: swoole-bundle
SERVICES: composer
BUILD_TYPE: dev
BUILD_TYPE: latest

check-composer-config:
docker:
Expand All @@ -312,6 +314,9 @@ jobs:
- run:
name: Validate composer configuration
command: composer validate
- run:
name: Check if there are any out of date dependencies
command: composer outdated --locked

shellcheck:
docker:
Expand Down Expand Up @@ -395,19 +400,19 @@ workflows:
- swoole-bundle-74-code-coverage:
requires:
- docker-buildx-bake-74
- docker-buildx-bake-dev:
- docker-buildx-bake-80-latest:
context: swoole-bundle-dockerhub
requires:
- docker-buildx-bake-74
- swoole-bundle-composer-dev-code-style:
- swoole-bundle-composer-80-latest-code-style:
requires:
- docker-buildx-bake-dev
- swoole-bundle-composer-dev-unit-tests:
- docker-buildx-bake-80-latest
- swoole-bundle-composer-80-latest-unit-tests:
requires:
- docker-buildx-bake-dev
- swoole-bundle-composer-dev-feature-tests:
- docker-buildx-bake-80-latest
- swoole-bundle-composer-80-latest-feature-tests:
requires:
- docker-buildx-bake-dev
- docker-buildx-bake-80-latest

pull-request-checks-untrusted:
when:
Expand Down Expand Up @@ -467,6 +472,19 @@ workflows:
- swoole-bundle-74-code-coverage:
requires:
- docker-buildx-bake-74
- docker-buildx-bake-80-latest:
context: swoole-bundle-dockerhub
requires:
- docker-buildx-bake-74
- swoole-bundle-composer-80-latest-code-style:
requires:
- docker-buildx-bake-80-latest
- swoole-bundle-composer-80-latest-unit-tests:
requires:
- docker-buildx-bake-80-latest
- swoole-bundle-composer-80-latest-feature-tests:
requires:
- docker-buildx-bake-80-latest

release:
when:
Expand Down Expand Up @@ -517,6 +535,19 @@ workflows:
- swoole-bundle-74-code-coverage:
requires:
- docker-buildx-bake-74
- docker-buildx-bake-80-latest:
context: swoole-bundle-dockerhub
requires:
- docker-buildx-bake-74
- swoole-bundle-composer-80-latest-code-style:
requires:
- docker-buildx-bake-80-latest
- swoole-bundle-composer-80-latest-unit-tests:
requires:
- docker-buildx-bake-80-latest
- swoole-bundle-composer-80-latest-feature-tests:
requires:
- docker-buildx-bake-80-latest
- approve-release:
type: approval
requires:
Expand All @@ -530,6 +561,9 @@ workflows:
- swoole-bundle-composer-73-lowest-code-style
- swoole-bundle-composer-74-unit-tests
- swoole-bundle-composer-74-code-style
- swoole-bundle-composer-80-latest-code-style
- swoole-bundle-composer-80-latest-unit-tests
- swoole-bundle-composer-80-latest-feature-tests
- releaser:
context: swoole-bundle-github
requires:
Expand Down
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,18 @@ matrix:
env:
- SWOOLE_LATEST=1
- COMPOSER_ARGS='update --ignore-platform-reqs'
- php: "8.0"
env:
- PHP_CS_FIXER_IGNORE_ENV=1
fast_finish: true
allow_failures:
- php: "7.4"
env:
- SWOOLE_LATEST=1
- COMPOSER_ARGS='update --ignore-platform-reqs'
- php: "8.0"
env:
- PHP_CS_FIXER_IGNORE_ENV=1

before_script:
- phpenv config-rm xdebug.ini
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"homepage": "https://github.com/k911"
}],
"require": {
"php": "^7.3",
"php": "^7.3|^8.0",
"ext-json": "*",
"ext-swoole": "^4.4.7",
"beberlei/assert": "^3.0",
Expand Down
4 changes: 2 additions & 2 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 37f4c3d

Please sign in to comment.