Skip to content
Yo-An Lin edited this page May 6, 2016 · 4 revisions

Since we are merging PRs from develop branch, to roll out a new release, we will need to create a rc branch for release candidate, the following steps is the process for merging new features:

git fetch origin
git checkout -b rc-1.18 origin/master
git merge origin/develop
git push origin rc-1.18     # push to github and see if the build fails on travis-ci

# test manually (bash, zsh, fish .. etc)

git merge origin/feature/*  # other feature branches

# test manually (bash, zsh, fish .. etc)

git push origin rc-1.1.8

# check build status on travis-ci

Before you roll out a new release, please download PHPRelease https://github.com/c9s/PHPRelease

The release steps is defined in phprelease.ini file, PHPRelease will run unit tests, compile phar file, git tagging and pushing for you.

The usage is pretty simple, but be sure to make all unit tests pass:

To release a minor version: (which is for new feature release, develop branch is merged into master branch)

$ phprelease --bump-minor

To release a patch version: (which is for bug fixes release, bug fixes are on master branch)

$ phprelease # bump patch version.

Updating Dependencies

To update dependencies, you need to go back to the older php version to run composer:

phpbrew use 5.4.45
composer update --prefer-source
git commit composer.lock -m "Update dependencies"