Skip to content

Commit

Permalink
DevKit updates
Browse files Browse the repository at this point in the history
  • Loading branch information
SonataCI authored and soullivaneuh committed Dec 4, 2017
1 parent 4e0d24f commit 988d32f
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@ $ php -v
If it's an error message or piece of code, use code block tags,
and make sure you provide the whole stack trace(s),
not just the first error message you can see.
More details here: https://github.com/sonata-project/SonataUserBundle/blob/3.x/CONTRIBUTING.md#issues
More details here: https://github.com/sonata-project/SonataUserBundle/blob/4.x/CONTRIBUTING.md#issues
-->
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<!--
Show us you choose the right branch.
Different branches are used for different things :
- 3.x is for everything backwards compatible, like patches, features and deprecation notices
- 4.x is for everything backwards compatible, like patches, features and deprecation notices
- master is for deprecation removals and other changes that cannot be done without a BC-break
More details here: https://github.com/sonata-project/SonataUserBundle/blob/3.x/CONTRIBUTING.md#the-base-branch
More details here: https://github.com/sonata-project/SonataUserBundle/blob/4.x/CONTRIBUTING.md#the-base-branch
-->
I am targeting this branch, because {reason}.

Expand Down
18 changes: 10 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
branches:
only:
- master
- 3.x
- 4.x

language: php

Expand Down Expand Up @@ -35,22 +35,24 @@ matrix:
include:
- php: '7.2'
env: TARGET=docs
- php: '5.6'
- php: '7.1'
env: TARGET=lint
- php: '7.1'
env: COMPOSER_FLAGS="--prefer-lowest"
- php: '7.2'
env: SYMFONY=2.8.*
- php: '7.2'
env: SYMFONY=3.2.*
- php: '7.1'
- php: '7.2'
env: SYMFONY=3.3.*
- php: '7.1'
env: SYMFONY='dev-master as 2.8.x-dev'
- php: '7.2'
env: SYMFONY=3.4.*
- php: '7.2'
env: SYMFONY='dev-master as 4.0.x-dev'
- php: '7.2'
env: FOS_USER=2.*
- php: '7.2'
env: FOS_USER='dev-master as 1.3.x-dev'
env: FOS_USER='dev-master as 2.x-dev'
- php: '7.2'
env: SONATA_CORE=3.*
- php: '7.2'
Expand All @@ -64,8 +66,8 @@ matrix:
allow_failures:
- php: nightly
- env: SYMFONY_DEPRECATIONS_HELPER=0
- env: SYMFONY='dev-master as 2.8.x-dev'
- env: FOS_USER='dev-master as 1.3.x-dev'
- env: SYMFONY='dev-master as 4.0.x-dev'
- env: FOS_USER='dev-master as 2.x-dev'
- env: SONATA_CORE='dev-master as 3.x-dev'
- env: SONATA_ADMIN='dev-master as 3.x-dev'

Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -207,15 +207,15 @@ Here is a short table resuming on which you have to start:

Kind of modification | Backward Compatible (BC) | Type of release | Branch to target | Label |
-------------------- | ------------------------ | --------------- | ----------------------- | ----- |
Bug fixes | Yes | Patch | `3.x` | |
Bug fixes | Yes | Patch | `4.x` | |
Bug fixes | No (Only if no choice) | Major | `master` | |
Feature | Yes | Minor | `3.x` | |
Feature | Yes | Minor | `4.x` | |
Feature | No (Only if no choice) | Major | `master` | |
Deprecation | Yes (Have to) | Minor | `3.x` | |
Deprecation | Yes (Have to) | Minor | `4.x` | |
Deprecation removal | No (Can't be) | Major | `master` | |

Notes:
* Branch `3.x` is the branch of the **latest stable** minor release and
* Branch `4.x` is the branch of the **latest stable** minor release and
has to be used for Backward compatible PRs.
* If you PR is not **Backward Compatible** but can be, it **must** be:
* Changing a function/method signature? Prefer create a new one and deprecate the old one.
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Symfony SonataUserBundle

Branch | Travis | Coveralls |
------ | ------ | --------- |
3.x | [![Build Status][travis_stable_badge]][travis_stable_link] | [![Coverage Status][coveralls_stable_badge]][coveralls_stable_link] |
4.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] |

## Documentation
Expand All @@ -30,12 +30,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/SonataUserBundle.svg?branch=3.x
[travis_stable_badge]: https://travis-ci.org/sonata-project/SonataUserBundle.svg?branch=4.x
[travis_stable_link]: https://travis-ci.org/sonata-project/SonataUserBundle
[travis_unstable_badge]: https://travis-ci.org/sonata-project/SonataUserBundle.svg?branch=master
[travis_unstable_link]: https://travis-ci.org/sonata-project/SonataUserBundle

[coveralls_stable_badge]: https://coveralls.io/repos/github/sonata-project/SonataUserBundle/badge.svg?branch=3.x
[coveralls_stable_link]: https://coveralls.io/github/sonata-project/SonataUserBundle?branch=3.x
[coveralls_stable_badge]: https://coveralls.io/repos/github/sonata-project/SonataUserBundle/badge.svg?branch=4.x
[coveralls_stable_link]: https://coveralls.io/github/sonata-project/SonataUserBundle?branch=4.x
[coveralls_unstable_badge]: https://coveralls.io/repos/github/sonata-project/SonataUserBundle/badge.svg?branch=master
[coveralls_unstable_link]: https://coveralls.io/github/sonata-project/SonataUserBundle?branch=master

0 comments on commit 988d32f

Please sign in to comment.