Skip to content

Solving merge conflicts with master #30

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Mar 2, 2020
Merged

Solving merge conflicts with master #30

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ee8840
Update README.md: Add information about releases and versioning (#24)
roribio Dec 20, 2019
1eb776c
SVC Release 3.0.0 (#27)
roribio Feb 27, 2020
04756e2
Merge remote-tracking branch 'origin/master' into develop
pdohogne-magento Mar 2, 2020
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
Next Next commit
Update README.md: Add information about releases and versioning (#24)
  • Loading branch information
@roribio
roribio authored Dec 20, 2019
commit 7ee884059370be0a154a1dd97d5c051ad3ee47b3
15 changes: 15 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,20 @@
- `php bin/svc compare` - Compare a set of files to determine what semantic versioning change needs to be done.
- `php bin/svc update-breaking-changes` - Update the file with a list of backward incompatible changes between two sources.

### Releases & Versioning

#### Releases

- Magento-semver development should happen against the `develop` branch.
- New releases will shipped monthly. However, new releases will only occur if the `develop` branch has diverged from the `master` branch.
- If a hot-fix needs to be applied, a new release may be cut at any time. If this happens, the release cycle does not change.

#### Versioning

- Versions will be handled via GitHub Tags.
- Only `MAJOR` versions, as understood by the Semantic Versioning specification, are allowed; e.g.: increasing from version `2.0.0` to version `3.0.0`.
- With each new version, the `composer.json` file must be updated to match the new target version before creating a tag.
- After a new version is released, `magento-semver` will be packaged and published to `repo.magento.com` for consumption.

## Tests
- `vendor/bin/phpunit -c tests/Unit/phpunit.xml.dist`