Skip to content

Commit

Permalink
DevKit updates (#884)
Browse files Browse the repository at this point in the history
  • Loading branch information
SonataCI authored Jun 6, 2017
2 parents 53e666e + f60fa2d commit 63893bb
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
-->
I am targeting this branch, because {reason}.

In case of bug fix, `3.x` **MUST** be targeted.

<!--
Specify which issues will be fixed/closed.
Remove it if this is not related.
Expand Down
7 changes: 6 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -191,15 +191,20 @@ 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 | Not on legacy | Patch | `3.x` | |
Bug fixes | No (Only if no choice) | Major | `master` | |
Feature | Yes | Minor | `3.x` | |
Feature | No (Only if no choice) | Major | `master` | |
Deprecation | Yes (Have to) | Minor | `3.x` | |
Deprecation removal | No (Can't be) | Major | `master` | |

Notes:
* Branch `3.x` is the branch of the **latest stable** patch releases and
has to be used for Backward Compatible bug fixes only.
* Branch `3.x` is the branch of the **latest stable** minor release and
has to be used for Backward compatible PRs.
has to be used for Backward compatible enhancement PRs.
**No bug fix will be accepted here**, except if the bug fix concerns `3.x` and **only this one**.
Bug fixes merged on `3.x` will be ported on other branches by fallback merging.
* 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.
* Code deletion? Don't. Please deprecate it instead.
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Symfony SonataUserBundle

Branch | Travis | Coveralls |
------ | ------ | --------- |
3.x | [![Build Status][travis_legacy_badge]][travis_legacy_link] | [![Coverage Status][coveralls_legacy_badge]][coveralls_legacy_link] |
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] |

Expand All @@ -30,11 +31,15 @@ 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_legacy_badge]: https://travis-ci.org/sonata-project/SonataUserBundle.svg?branch=3.x
[travis_legacy_link]: https://travis-ci.org/sonata-project/SonataUserBundle
[travis_stable_badge]: https://travis-ci.org/sonata-project/SonataUserBundle.svg?branch=3.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_legacy_badge]: https://coveralls.io/repos/github/sonata-project/SonataUserBundle/badge.svg?branch=3.x
[coveralls_legacy_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=3.x
[coveralls_stable_link]: https://coveralls.io/github/sonata-project/SonataUserBundle?branch=3.x
[coveralls_unstable_badge]: https://coveralls.io/repos/github/sonata-project/SonataUserBundle/badge.svg?branch=master
Expand Down

0 comments on commit 63893bb

Please sign in to comment.