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

DevKit updates for 3.x branch #6346

Merged
merged 1 commit into from
Aug 29, 2020
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
19 changes: 12 additions & 7 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ jobs:
dependencies: highest
allowed_to_fail: true
variant: normal
- php-version: '7.3'
- php-version: '7.4'
dependencies: highest
allowed_to_fail: false
variant: 'symfony/symfony:"4.4.*"'
- php-version: '7.3'
- php-version: '7.4'
dependencies: highest
allowed_to_fail: false
variant: 'sonata-project/block-bundle:"3.*"'
Expand Down Expand Up @@ -71,6 +71,10 @@ jobs:
key: ${{ runner.os }}-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ matrix.variant }}
restore-keys: ${{ runner.os }}-${{ matrix.php-version }}-composer-

- name: Configuration required for PHP 8.0
if: matrix.php-version == '8.0'
run: composer config platform.php 7.4.99 && composer require phpunit/phpunit:"9.3.*" --no-update

- name: Install variant
if: matrix.variant != 'normal'
run: composer require ${{ matrix.variant }} --no-update
Expand All @@ -80,16 +84,17 @@ jobs:
run: composer update --prefer-dist --no-progress --no-interaction --prefer-stable --prefer-lowest

- name: Install Composer dependencies (highest)
if: matrix.dependencies == 'highest' && matrix.php-version != '8.0'
if: matrix.dependencies == 'highest'
run: composer update --prefer-dist --no-progress --no-interaction --prefer-stable

- name: Install Composer dependencies (highest) on PHP 8.0
if: matrix.dependencies == 'highest' && matrix.php-version == '8.0'
run: composer update --prefer-dist --no-progress --no-interaction --prefer-stable --ignore-platform-req=php

- name: Run Tests
if: matrix.php-version != '8.0'
run: make test

- name: Run Tests (PHP 8.0)
if: matrix.php-version == '8.0'
run: vendor/bin/phpunit --coverage-clover build/logs/clover.xml

- name: Send coverage to Codecov
uses: codecov/codecov-action@v1
with:
Expand Down
67 changes: 0 additions & 67 deletions .travis.yml

This file was deleted.

9 changes: 0 additions & 9 deletions .travis/after_success_test.sh

This file was deleted.

17 changes: 0 additions & 17 deletions .travis/before_install_test.sh

This file was deleted.

12 changes: 0 additions & 12 deletions .travis/before_script_test.sh

This file was deleted.

11 changes: 0 additions & 11 deletions .travis/check_relevant_test.sh

This file was deleted.

17 changes: 0 additions & 17 deletions .travis/install_test.sh

This file was deleted.

24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ The missing Symfony Admin Generator
[![Monthly Downloads](https://poser.pugx.org/sonata-project/admin-bundle/d/monthly)](https://packagist.org/packages/sonata-project/admin-bundle)
[![Daily Downloads](https://poser.pugx.org/sonata-project/admin-bundle/d/daily)](https://packagist.org/packages/sonata-project/admin-bundle)

Branch | Travis | Coveralls |
------ | ------ | --------- |
3.x | [![Build Status][travis_stable_badge]][travis_stable_link] | [![Coverage Status][coveralls_stable_badge]][coveralls_stable_link] |
master | [![Build Status][travis_unstable_badge]][travis_unstable_link] | [![Coverage Status][coveralls_unstable_badge]][coveralls_unstable_link] |
Branch | Github Actions | Coverage |
------ | -------------- | -------- |
3.x | [![Test][test_stable_badge]][test_stable_link] | [![Coverage Status][coverage_stable_badge]][coverage_stable_link] |
master | [![Test][test_unstable_badge]][test_unstable_link] | [![Coverage Status][coverage_unstable_badge]][coverage_unstable_link] |

## Documentation

Expand All @@ -36,12 +36,12 @@ If you think you found a bug or you have a feature idea to propose, feel free to

This package is available under the [MIT license](LICENSE).

[travis_stable_badge]: https://travis-ci.org/sonata-project/SonataAdminBundle.svg?branch=3.x
[travis_stable_link]: https://travis-ci.org/sonata-project/SonataAdminBundle
[travis_unstable_badge]: https://travis-ci.org/sonata-project/SonataAdminBundle.svg?branch=master
[travis_unstable_link]: https://travis-ci.org/sonata-project/SonataAdminBundle
[test_stable_badge]: https://github.com/sonata-project/SonataAdminBundle/workflows/Test/badge.svg?branch=3.x
[test_stable_link]: https://github.com/sonata-project/SonataAdminBundle/actions?query=workflow:test+branch:3.x
[test_unstable_badge]: https://github.com/sonata-project/SonataAdminBundle/workflows/Test/badge.svg?branch=master
[test_unstable_link]: https://github.com/sonata-project/SonataAdminBundle/actions?query=workflow:test+branch:master

[coveralls_stable_badge]: https://coveralls.io/repos/github/sonata-project/SonataAdminBundle/badge.svg?branch=3.x
[coveralls_stable_link]: https://coveralls.io/github/sonata-project/SonataAdminBundle?branch=3.x
[coveralls_unstable_badge]: https://coveralls.io/repos/github/sonata-project/SonataAdminBundle/badge.svg?branch=master
[coveralls_unstable_link]: https://coveralls.io/github/sonata-project/SonataAdminBundle?branch=master
[coverage_stable_badge]: https://codecov.io/gh/sonata-project/SonataAdminBundle/branch/3.x/graph/badge.svg
[coverage_stable_link]: https://codecov.io/gh/sonata-project/SonataAdminBundle/branch/3.x
[coverage_unstable_badge]: https://codecov.io/gh/sonata-project/SonataAdminBundle/branch/master/graph/badge.svg
[coverage_unstable_link]: https://codecov.io/gh/sonata-project/SonataAdminBundle/branch/master