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

Commit

Permalink
DevKit updates (#378)
Browse files Browse the repository at this point in the history
  • Loading branch information
SonataCI authored and soullivaneuh committed Jun 24, 2016
1 parent 77f1885 commit 04ee6f8
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 13 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/ecommerce/blob/master/CONTRIBUTING.md#issues
More details here: https://github.com/sonata-project/ecommerce/blob/1.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 :
- master is for everything backwards compatible, like patches, features and deprecation notices
- 1.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/ecommerce/blob/master/CONTRIBUTING.md#the-base-branch
More details here: https://github.com/sonata-project/ecommerce/blob/1.x/CONTRIBUTING.md#the-base-branch
-->
I am targetting this branch, because…

Expand Down
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
branches:
only:
- master
- 1.x

language: php

Expand Down
2 changes: 1 addition & 1 deletion .travis/install_docs.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
set -ev

pip install -r Resources/doc/requirements.txt --user $(whoami)
pip install -r docs/requirements.txt --user $(whoami)
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,15 +150,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 | `master` | |
Bug fixes | Yes | Patch | `1.x` | |
Bug fixes | No (Only if no choice) | Major | `master` | |
Feature | Yes | Minor | `master` | |
Feature | Yes | Minor | `1.x` | |
Feature | No (Only if no choice) | Major | `master` | |
Deprecation | Yes (Have to) | Minor | `master` | |
Deprecation | Yes (Have to) | Minor | `1.x` | |
Deprecation removal | No (Can't be) | Major | `master` | |

Notes:
* Branch `master` is the branch of the **latest stable** minor release and
* Branch `1.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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ test:
phpunit -c phpunit.xml.dist --coverage-clover build/logs/clover.xml

docs:
cd Resources/doc && sphinx-build -W -b html -d _build/doctrees . _build/html
cd docs && sphinx-build -W -b html -d _build/doctrees . _build/html
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ E-Commerce solution provided by Sonata

Branch | Travis | Coveralls |
------ | ------ | --------- |
master | [![Build Status][travis_stable_badge]][travis_stable_link] | [![Coverage Status][coveralls_stable_badge]][coveralls_stable_link] |
1.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 find 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/ecommerce.svg?branch=master
[travis_stable_badge]: https://travis-ci.org/sonata-project/ecommerce.svg?branch=1.x
[travis_stable_link]: https://travis-ci.org/sonata-project/ecommerce
[travis_unstable_badge]: https://travis-ci.org/sonata-project/ecommerce.svg?branch=master
[travis_unstable_link]: https://travis-ci.org/sonata-project/ecommerce

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

0 comments on commit 04ee6f8

Please sign in to comment.