fix(package): update @semantic-release/github back to a build from the beta branch

* Only the beta channel that is compatible with semantic-release v16 * 5.4.0-beta.1 worked, but subsequently v5.4.3 was released from master but didn't include the changes from the beta branch and 5.4.0-beta.1.
fix: prefix git auth url with "x-access-token:" when run in a GitHub Action
2019-09-12 12:30:03 -07:00 · 2019-09-12 12:30:03 -07:00 · 2019-06-07 16:03:30 -04:00 · 2019-06-07 16:03:30 -04:00 · 2019-06-06 12:54:21 -04:00 · 2019-06-05 17:18:17 -04:00
57 changed files with 4359 additions and 642 deletions
@@ -7,11 +7,14 @@ node_js:
  - 10
  - 8

-# Trigger a push build on master and greenkeeper branches + PRs build on every branches
+# Trigger a push build on release and greenkeeper branches + PRs build on every branches
 # Avoid double build on PRs (See https://github.com/travis-ci/travis-ci/issues/1147)
 branches:
  only:
    - master
+    - next
+    - beta
+    - /^\d+\.(\d+|x)(\.x)?$/
    - /^greenkeeper.*$/

 # Retry install on fail to avoid failing a build on network/disk/external errors
@@ -17,6 +17,11 @@
    <img alt="semantic-release" src="https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg">
  </a>
 </p>
+<p align="center">
+  <a href="https://waffle.io/semantic-release/semantic-release">
+    <img alt="Waffle.io" src="https://badge.waffle.io/semantic-release/semantic-release.svg?columns=all">
+  </a>
+</p>
 <p align="center">
  <a href="https://www.npmjs.com/package/semantic-release">
    <img alt="npm latest version" src="https://img.shields.io/npm/v/semantic-release/latest.svg">
@@ -24,6 +29,9 @@
  <a href="https://www.npmjs.com/package/semantic-release">
    <img alt="npm next version" src="https://img.shields.io/npm/v/semantic-release/next.svg">
  </a>
+  <a href="https://www.npmjs.com/package/semantic-release">
+    <img alt="npm beta version" src="https://img.shields.io/npm/v/semantic-release/beta.svg">
+  </a>
 </p>

 **semantic-release** automates the whole package release workflow including: determining the next version number, generating the release notes and publishing the package.
@@ -39,6 +47,7 @@ This removes the immediate connection between human emotions and version numbers
 - New features and fixes are immediately available to users
 - Notify maintainers and users of new releases
 - Use formalized commit message convention to document changes in the codebase
+- Publish on different distribution channels (such as [npm dist-tags](https://docs.npmjs.com/cli/dist-tag)) based on git merges
 - Integrate with your [continuous integration workflow](docs/recipes/README.md#ci-configurations)
 - Avoid potential errors associated with manual releases
 - Support any [package managers and languages](docs/recipes/README.md#package-managers-and-languages) via [plugins](docs/usage/plugins.md)
@@ -52,7 +61,7 @@ This removes the immediate connection between human emotions and version numbers

 By default **semantic-release** uses [Angular Commit Message Conventions](https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#-git-commit-guidelines). The commit message format can be changed with the [`preset` or `config` options](docs/usage/configuration.md#options) of the [@semantic-release/commit-analyzer](https://github.com/semantic-release/commit-analyzer#options) and [@semantic-release/release-notes-generator](https://github.com/semantic-release/release-notes-generator#options) plugins.

-Tools such as [commitizen](https://github.com/commitizen/cz-cli), [commitlint](https://github.com/conventional-changelog/commitlint) or [semantic-git-commit-cli](https://github.com/JPeer264/node-semantic-git-commit-cli) can be used to help contributors and enforce valid commit messages.
+Tools such as [commitizen](https://github.com/commitizen/cz-cli), [commitlint](https://github.com/marionebl/commitlint) or [semantic-git-commit-cli](https://github.com/JPeer264/node-semantic-git-commit-cli) can be used to help contributors and enforce valid commit messages.

 Here is an example of the release type that will be done based on a commit messages:

@@ -68,11 +77,12 @@ Here is an example of the release type that will be done based on a commit messa

 ### Triggering a release

-For each new commits added to the release branch (i.e. `master`) with `git push` or by merging a pull request or merging from another branch, a CI build is triggered and runs the `semantic-release` command to make a release if there are codebase changes since the last release that affect the package functionalities.
+For each new commits added to one of the release branches (for example `master`, `next`, `beta`), with `git push` or by merging a pull request or merging from another branch, a CI build is triggered and runs the `semantic-release` command to make a release if there are codebase changes since the last release that affect the package functionalities.

-If you need more control over the timing of releases you have a couple of options:
- Publish releases on a distribution channel (for example npm’s [dist-tags](https://docs.npmjs.com/cli/dist-tag)). This way you can keep control over what your users end up using by default, and you can decide when to make an automatically released version available to the stable channel, and promote it.
- Develop on a `dev` branch and merge it to the release branch (i.e. `master`) once you are ready to publish. **semantic-release** will run only on pushes to the release branch.
+**semantic-release** offers various ways to control the timing, the content and the audience of published releases. See example workflows in the following recipes:
+- [Using distribution channels](docs/recipes/distribution-channels.md#publishing-on-distribution-channels)
+- [Maintenance releases](docs/recipes/maintenance-releases.md#publishing-maintenance-releases)
+- [Pre-releases](docs/recipes/pre-releases.md#publishing-pre-releases)

 ### Release steps

@@ -104,6 +114,8 @@ After running the tests, the command `semantic-release` will execute the followi
  - [Shareable configuration](docs/extending/shareable-configurations-list.md)
 - Recipes
  - [CI configurations](docs/recipes/README.md)
+  - [Git hosted services](docs/recipes/README.md)
+  - [Release workflow](docs/recipes/README.md)
  - [Package managers and languages](docs/recipes/README.md)
 - Developer guide
  - [JavaScript API](docs/developer-guide/js-api.md)
@@ -19,7 +19,7 @@ module.exports = async () => {
 Usage:
  semantic-release [options] [plugins]`);
    })
-    .option('b', {alias: 'branch', describe: 'Git branch to release from', type: 'string', group: 'Options'})
+    .option('b', {alias: 'branches', describe: 'Git branches to release from', ...stringList, group: 'Options'})
    .option('r', {alias: 'repository-url', describe: 'Git repository URL', type: 'string', group: 'Options'})
    .option('t', {alias: 'tag-format', describe: 'Git tag format', type: 'string', group: 'Options'})
    .option('p', {alias: 'plugins', describe: 'Plugins', ...stringList, group: 'Options'})
@@ -12,7 +12,14 @@ const stderrBuffer = WritableStreamBuffer();
 try {
  const result = await semanticRelease({
    // Core options
-    branch: 'master',
+    branches: [
+      '+([0-9])?(.{+([0-9]),x}).x',
+      'master',
+      'next',
+      'next-major',
+      {name: 'beta', prerelease: true},
+      {name: 'alpha', prerelease: true}
+    ],
    repositoryUrl: 'https://github.com/me/my-package.git',
    // Shareable config
    extends: 'my-shareable-config',
@@ -39,7 +46,7 @@ try {
    }

    for (const release of releases) {
-      console.log(`The release was published with plugin "${release.pluginName}".`);
+      console.log(`The release was published with plugin "${pluginName}".`);
    }
  } else {
    console.log('No release published.');
@@ -123,11 +130,12 @@ Type: `Object`

 Information related to the last release found:

-| Name    | Type     | Description                                                                                        |
-|---------|----------|----------------------------------------------------------------------------------------------------|
-| version | `String` | The version of the last release.                                                                   |
-| gitHead | `String` | The sha of the last commit being part of the last release.                                         |
-| gitTag  | `String` | The [Git tag](https://git-scm.com/book/en/v2/Git-Basics-Tagging) associated with the last release. |
+| Name    | Type     | Description                                                                                                                         |
+|---------|----------|-------------------------------------------------------------------------------------------------------------------------------------|
+| version | `String` | The version of the last release.                                                                                                    |
+| gitHead | `String` | The sha of the last commit being part of the last release.                                                                          |
+| gitTag  | `String` | The [Git tag](https://git-scm.com/book/en/v2/Git-Basics-Tagging) associated with the last release.                                  |
+| channel | `String` | The distribution channel on which the last release was initially made available (`undefined` for the default distribution channel). |

 **Notes**: If no previous release is found, `lastRelease` will be an empty `Object`.

@@ -137,6 +145,7 @@ Example:
  gitHead: 'da39a3ee5e6b4b0d3255bfef95601890afd80709',
  version: '1.0.0',
  gitTag: 'v1.0.0',
+  channel: 'next'
 }
 ```

@@ -206,13 +215,14 @@ Type: `Object`

 Information related to the newly published release:

-| Name    | Type     | Description                                                                                       |
-|---------|----------|---------------------------------------------------------------------------------------------------|
-| type    | `String` | The [semver](https://semver.org) type of the release (`patch`, `minor` or `major`).               |
-| version | `String` | The version of the new release.                                                                   |
-| gitHead | `String` | The sha of the last commit being part of the new release.                                         |
-| gitTag  | `String` | The [Git tag](https://git-scm.com/book/en/v2/Git-Basics-Tagging) associated with the new release. |
-| notes   | `String` | The release notes for the new release.                                                            |
+| Name    | Type     | Description                                                                                                                   |
+|---------|----------|-------------------------------------------------------------------------------------------------------------------------------|
+| type    | `String` | The [semver](https://semver.org) type of the release (`patch`, `minor` or `major`).                                           |
+| version | `String` | The version of the new release.                                                                                               |
+| gitHead | `String` | The sha of the last commit being part of the new release.                                                                     |
+| gitTag  | `String` | The [Git tag](https://git-scm.com/book/en/v2/Git-Basics-Tagging) associated with the new release.                             |
+| notes   | `String` | The release notes for the new release.                                                                                        |
+| channel | `String` | The distribution channel on which the next release will be made available (`undefined` for the default distribution channel). |

 Example:
 ```js
@@ -222,6 +232,7 @@ Example:
  version: '1.1.0',
  gitTag: 'v1.1.0',
  notes: 'Release notes for version 1.1.0...',
+  channel : 'next'
 }
 ```

@@ -229,19 +240,20 @@ Example:

 Type: `Array<Object>`

-The list of releases published, one release per [publish plugin](../usage/plugins.md#publish-plugin).<br>
+The list of releases published or made available to a distribution channel.<br>
 Each release object has the following properties:

-| Name       | Type     | Description                                                                                   |
-|------------|----------|-----------------------------------------------------------------------------------------------|
-| name       | `String` | **Optional.** The release name, only if set by the corresponding `publish` plugin.            |
-| url        | `String` | **Optional.** The release URL, only if set by the corresponding `publish` plugin.             |
-| type       | `String` | The [semver](https://semver.org) type of the release (`patch`, `minor` or `major`).           |
-| version    | `String` | The version of the release.                                                                   |
-| gitHead    | `String` | The sha of the last commit being part of the release.                                         |
-| gitTag     | `String` | The [Git tag](https://git-scm.com/book/en/v2/Git-Basics-Tagging) associated with the release. |
-| notes      | `String` | The release notes for the release.                                                            |
-| pluginName | `String` | The name of the plugin that published the release.                                            |
+| Name       | Type     | Description                                                                                                    |
+|------------|----------|----------------------------------------------------------------------------------------------------------------|
+| name       | `String` | **Optional.** The release name, only if set by the corresponding `publish` plugin.                             |
+| url        | `String` | **Optional.** The release URL, only if set by the corresponding `publish` plugin.                              |
+| type       | `String` | The [semver](https://semver.org) type of the release (`patch`, `minor` or `major`).                            |
+| version    | `String` | The version of the release.                                                                                    |
+| gitHead    | `String` | The sha of the last commit being part of the release.                                                          |
+| gitTag     | `String` | The [Git tag](https://git-scm.com/book/en/v2/Git-Basics-Tagging) associated with the release.                  |
+| notes      | `String` | The release notes for the release.                                                                             |
+| pluginName | `String` | The name of the plugin that published the release.                                                             |
+| channel    | `String` | The distribution channel on which the release is available (`undefined` for the default distribution channel). |

 Example:
 ```js
@@ -255,6 +267,7 @@ Example:
    gitTag: 'v1.1.0',
    notes: 'Release notes for version 1.1.0...',
    pluginName: '@semantic-release/github'
+    channel: 'next'
  },
  {
    name: 'npm package (@latest dist-tag)',
@@ -265,6 +278,7 @@ Example:
    gitTag: 'v1.1.0',
    notes: 'Release notes for version 1.1.0...',
    pluginName: '@semantic-release/npm'
+    channel: 'next'
   }
 ]
 ```
@@ -2,19 +2,15 @@

 ## Official plugins
 - [@semantic-release/commit-analyzer](https://github.com/semantic-release/commit-analyzer)
-  - **Note**: this is already part of semantic-release and does not have to be installed separately
  - `analyzeCommits`: Determine the type of release by analyzing commits with [conventional-changelog](https://github.com/conventional-changelog/conventional-changelog)
 - [@semantic-release/release-notes-generator](https://github.com/semantic-release/release-notes-generator)
-  - **Note**: this is already part of semantic-release and does not have to be installed separately
  - `generateNotes`: Generate release notes for the commits added since the last release with [conventional-changelog](https://github.com/conventional-changelog/conventional-changelog)
 - [@semantic-release/github](https://github.com/semantic-release/github)
-  - **Note**: this is already part of semantic-release and does not have to be installed separately
  - `verifyConditions`: Verify the presence and the validity of the GitHub authentication and release configuration
  - `publish`: Publish a [GitHub release](https://help.github.com/articles/about-releases)
  - `success`: Add a comment to GitHub issues and pull requests resolved in the release
  - `fail`: Open a GitHub issue when a release fails
 - [@semantic-release/npm](https://github.com/semantic-release/npm)
-  - **Note**: this is already part of semantic-release and does not have to be installed separately
  - `verifyConditions`: Verify the presence and the validity of the npm authentication and release configuration
  - `prepare`: Update the package.json version and create the npm package tarball
  - `publish`: Publish the package on the npm registry
@@ -45,10 +41,6 @@

 [Open a Pull Request](https://github.com/semantic-release/semantic-release/blob/master/CONTRIBUTING.md#submitting-a-pull-request) to add your plugin to the list.

- [semantic-release-slack-bot](https://github.com/juliuscc/semantic-release-slack-bot)
-  - `verifyConditions`: Verify that the environment variable `SLACK_WEBHOOK` has been defined.
-  - `success`: Publish a message about the success to a slack channel.
-  - `fail`: Optionally publish a message about failure to a slack channel.
 - [semantic-release-docker](https://github.com/felixfbecker/semantic-release-docker)
  - `verifyConditions`: Verify that all needed configuration is present and login to the Docker registry.
  - `publish`: Tag the image specified by `name` with the new version, push it to Docker Hub and update the latest tag
@@ -80,14 +72,4 @@
  - `prepare`: Changes the version number in the `pom.xml` (or all `pom.xml` files in maven projects with multiple `pom.xml` files) and optionally creates a commit with this version number and pushes it to `master`
  - `publish`: Runs `mvn deploy` to deploy to maven central and optionally will update to next snapshot version and merge changes to development branch
 - [semantic-release-ado](https://github.com/lluchmk/semantic-release-ado)
-  - `prepare`: Stores the version number as an Azure DevOps pipeline variable availabe to downstream steps on the job
- [gradle-semantic-release](https://github.com/KengoTODA/gradle-semantic-release-plugin)
-  - `verifyConditions`: Verify that project has a Gradle wrapper script, and `build.gradle` contains a task to publish artifacts.
-  - `prepare`: Changes the version number in the `gradle.properties`
-  - `publish`: Triggers Gradle to publish artifacts.
- [semantic-release-circleci-orb](https://github.com/matt-oakes/semantic-release-circleci-orb)
-  - `verifyConditions`: Verify the presence of the `CIRCLECI_API_TOKEN` environment variable, `orbName` option, and the `circleci` CLI.
-  - `publish`: Publish the CircleCI orb.
- [semantic-release-github-pages](https://github.com/qiwi/semantic-release-gh-pages-plugin)
-  - `verifyConditions`: Verify the presence of the auth token set via environment variables.
-  - `publish`: Pushes commit to the documentation branch.
+  - `prepare`: Stores the version number as an Azure DevOps pipeline variable availabe to downstream steps on the job
@@ -8,4 +8,9 @@
 ## Git hosted services
 - [Git authentication with SSH keys](git-auth-ssh-keys.md)

+## Release workflow
+- [Publishing on distribution channels](distribution-channels.md)
+- [Publishing maintenance releases](maintenance-releases.md)
+- [Publishing pre-releases](pre-releases.md)
+
 ## Package managers and languages
@@ -0,0 +1,116 @@
+# Publishing on distribution channels
+
+This recipe will walk you through a simple example that uses distribution channels to make releases available only to a subset of users, in order to collect feedbacks before distributing the release to all users.
+
+This example uses the **semantic-release** default configuration:
+- [branches](../usage/configuration.md#branches): `['+([0-9])?(.{+([0-9]),x}).x', 'master', 'next', 'next-major', {name: 'beta', prerelease: true}, {name: 'alpha', prerelease: true}]`
+- [plugins](../usage/configuration.md#plugins): `['@semantic-release/commit-analyzer', '@semantic-release/release-notes-generator', '@semantic-release/npm', '@semantic-release/github']`
+
+## Initial release
+
+We'll start by making the first commit of the project, with the code for the initial release and the message `feat: initial commit` to `master`. When pushing that commit, **semantic-release** will release the version `1.0.0` and make it available on the default distribution channel which is the dist-tag `@latest` for npm.
+
+The Git history of the repository is:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+```
+
+## Releasing a bug fix
+
+We can now continue to commit changes and release updates to our users. For example we can commit a bug fix with the message `fix: a fix` to `master`. When pushing that commit, **semantic-release** will release the version `1.0.1` on the dist-tag `@latest`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+* fix: a fix # => v1.0.1 on @latest
+```
+
+## Releasing a feature on next
+
+We now want to develop an important feature, which is a breaking change. Considering the scope of this feature we want to make it available, at first, only to our most dedicated users in order to get feedback. Once we get that feedback we can make improvements and ultimately make the new feature available to all users.
+
+To implement that workflow we can create the branch `next` and commit our feature to this branch. When pushing that commit, **semantic-release** will release the version `2.0.0` on the dist-tag `@next`. That means only the users installing our module with `npm install example-module@next` will receive the version `2.0.0`. Other users installing with `npm install example-module` will still receive the version `1.0.1`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+* fix: a fix # => v1.0.1 on @latest
+| \
+|  * feat: a big feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0 on @next
+```
+
+## Releasing a bug fix on next
+
+One of our users starts to use the new `2.0.0` release and reports a bug. We develop a bug fix and commit it to the `next` branch with the message `fix: fix something on the big feature`. When pushing that commit, **semantic-release** will release the version `2.0.1` on the dist-tag `@next`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+* fix: a fix # => v1.0.1 on @latest
+| \
+|  * feat: a big feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0 on @next
+|  * fix: fix something on the big feature # => v2.0.1 on @next
+```
+
+## Releasing a feature on latest
+
+We now want to develop a smaller, non-breaking feature. Its scope is small enough that we don't need to have a phase of feedback and we can release it to all users right away.
+
+If we were to commit that feature on `next` only a subset of users would get it, and we would need to wait for the end of our feedback period in order to make both the big and the small feature available to all users.
+
+Instead, we develop that small feature commit it to `master` with the message `feat: a small feature`. When pushing that commit, **semantic-release** will release the version `1.1.0` on the dist-tag `@latest` so all users can benefit from it right away.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+* fix: a fix # => v1.0.1 on @latest
+| \
+|  * feat: a big feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0 on @next
+|  * fix: fix something on the big feature # => v2.0.1 on @next
+*  | feat: a small feature # => v1.1.0 on @latest
+```
+
+## Porting a feature to next
+
+Most of our users now have access to the small feature, but we still need to make it available to our users using the `@next` dist-tag. To do so we need to merge our changes made on `master` (the commit `feat: a small feature`) into `next`. As `master` and `next` branches have diverged, this merge might require to resolve conflicts.
+
+Once the conflicts are resolved and the merge commit is pushed to `next`, **semantic-release** will release the version `2.1.0` on the dist-tag `@next` which contains both our small and big feature.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+* fix: a fix # => v1.0.1 on @latest
+| \
+|  * feat: a big feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0 on @next
+|  * fix: fix something on the big feature # => v2.0.1 on @next
+*  | feat: a small feature # => v1.1.0 on @latest
+|  * Merge branch master into next # => v2.1.0 on @next
+```
+
+## Adding a version to latest
+
+After a period of feedback from our users using the `@next` dist-tag we feel confident to make our big feature available to all users. To do so we merge the `next` branch into `master`. There should be no conflict as `next` is strictly ahead of `master`.
+
+Once the merge commit is pushed to `next`, **semantic-release** will add the version `2.1.0` to the dist-tag `@latest` so all users will receive it when installing out module with `npm install example-module`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+* fix: a fix # => v1.0.1 on @latest
+| \
+|  * feat: a big feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0 on @next
+|  * fix: fix something on the big feature # => v2.0.1 on @next
+*  | feat: a small feature # => v1.1.0 on @latest
+|  * Merge branch master into next # => v2.1.0 on @next
+| /|
+*  | Merge branch next into master # => v2.1.0 on @latest
+```
+
+We can now continue to push new fixes and features on `master`, or a new breaking change on `next` as we did before.
@@ -137,7 +137,7 @@ jobs:
          # Make sure only the current user can read the private key
          - chmod 600 /tmp/git_deploy_key
          # Create a script to return the passphrase environment variable to ssh-add
-          - echo 'echo ${SSL_PASSPHRASE}' > /tmp/askpass && chmod +x /tmp/askpass
+          - echo 'echo ${SSH_PASSPHRASE}' > /tmp/askpass && chmod +x /tmp/askpass
          # Start the authentication agent
          - eval "$(ssh-agent -s)"
          # Add the key to the authentication agent
@@ -0,0 +1,156 @@
+# Publishing maintenance releases
+
+This recipe will walk you through a simple example that uses Git branches and distribution channels to publish fixes and features for old versions of a package.
+
+This example uses the **semantic-release** default configuration:
+- [branches](../usage/configuration.md#branches): `['+([0-9])?(.{+([0-9]),x}).x', 'master', 'next', 'next-major', {name: 'beta', prerelease: true}, {name: 'alpha', prerelease: true}]`
+- [plugins](../usage/configuration.md#plugins): `['@semantic-release/commit-analyzer', '@semantic-release/release-notes-generator', '@semantic-release/npm', '@semantic-release/github']`
+
+## Initial release
+
+We'll start by making the first commit of the project, with the code for the initial release and the message `feat: initial commit`. When pushing that commit, on `master` **semantic-release** will release the version `1.0.0` and make it available on the default distribution channel which is the dist-tag `@latest` for npm.
+
+The Git history of the repository is:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+```
+
+## Releasing a breaking change
+
+We now decide to drop Node.js 6 support for our package, and require Node.js 8 or higher, which is a breaking change.  
+
+We commit that change with the message `feat: drop Node.js 6 support \n\n BREAKING CHANGE: Node.js >= 8 required` to `master`. When pushing that commit, **semantic-release** will release the version `2.0.0` on the dist-tag `@latest`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+* feat: drop Node.js 6 support \n\n BREAKING CHANGE: Node.js >= 8 required # => v2.0.0 on @latest
+```
+
+## Releasing a feature for version 1.x users
+
+One of our users request a new feature, however they cannot migrate to Node.js 8 or higher due to corporate policies.
+
+If we were to push that feature on `master` and release it, the new version would require Node.js 8 or higher as the release would also contains the commit `feat: drop Node.js 6 support \n\n BREAKING CHANGE: Node.js >= 8 required`.
+
+Instead, we create the branch `1.x` from the tag `v1.0.0` with the command `git checkout -b 1.x v1.0.0` and we commit that feature with the message `feat: a feature` to the branch `1.x`. When pushing that commit, **semantic-release** will release the version `1.1.0` on the dist-tag `@release-1.x` so users who can't migrate to Node.js 8 or higher can benefit from it.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+*  | feat: drop Node.js 6 support \n\n BREAKING CHANGE: Node.js >= 8 required # => v2.0.0 on @latest
+|  * feat: a feature # => v1.1.0 on @1.x
+```
+
+## Releasing a bug fix for version 1.0.x users
+
+Another user currently using version `1.0.0` reports a bug. They cannot migrate to Node.js 8 or higher and they also cannot migrate to `1.1.0` as they do not use the feature developed in `feat: a feature` and their corporate policies require to go through a costly quality insurance process for each `minor` upgrades.
+
+In order to deliver the bug fix in a `patch` release, we create the branch `1.0.x` from the tag `v1.0.0` with the command `git checkout -b 1.0.x v1.0.0` and we commit that fix with the message `fix: a fix` to the branch `1.0.x`. When pushing that commit, **semantic-release** will release the version `1.0.1` on the dist-tag `@release-1.0.x` so users who can't migrate to `1.1.x` or `2.x` can benefit from it.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+*  | feat: drop Node.js 6 support \n\n BREAKING CHANGE: Node.js >= 8 required # => v2.0.0 on @latest
+|  | \
+|  *  | feat: a feature # => v1.1.0 on @1.x
+|  |  * fix: a fix # => v1.0.1 on @1.0.x
+```
+
+## Porting a bug fix from 1.0.x to 1.x
+
+Now that we have released a fix in version `1.0.1` we want to make it available to `1.1.x` users as well.
+
+To do so we need to merge the changes made on `1.0.x` (the commit `fix: a fix`) into the `1.x` branch. As `1.0.x` and `1.x` branches have diverged, this merge might require to resolve conflicts.
+
+Once the conflicts are resolved and the merge commit is pushed to the branch `1.x`, **semantic-release** will release the version `1.1.1` on the dist-tag `@release-1.x` which contains both our feature and bug fix.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+*  | feat: drop Node.js 6 support \n\n BREAKING CHANGE: Node.js >= 8 required # => v2.0.0 on @latest
+|  | \
+|  *  | feat: a feature # => v1.1.0 on @1.x
+|  |  * fix: a fix # => v1.0.1 on @1.0.x
+|  | /|
+|  *  | Merge branch 1.0.x into 1.x # => v1.1.1 on @1.x
+```
+
+## Porting bug fixes and features to master
+
+Finally we want to make both our feature and bug fix available to users using the `@latest` dist-tag.
+
+To do so we need to merge the changes made on `1.x` (the commits `feat: a feature` and `fix: a fix`) into `master`. As `1.x` and `master` branches have diverged, this merge might require to resolve conflicts.
+
+Once the conflicts are resolved and the merge commit is pushed to `master`, **semantic-release** will release the version `2.1.0` on the dist-tag `@latest` which now contains the breaking change feature, the feature and the bug fix.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+*  | feat: drop Node.js 6 support \n\n BREAKING CHANGE: Node.js >= 8 required # => v2.0.0 on @latest
+|  | \
+|  *  | feat: a feature # => v1.1.0 on @1.x
+|  |  * fix: a fix # => v1.0.1 on @1.0.x
+|  | /|
+|  *  | Merge branch 1.0.x into 1.x # => v1.1.1 on @1.x
+| /|  |
+*  |  | Merge branch 1.x into master # => v2.1.0 on @latest
+```
+
+## Releasing a bug fix for version 2.1.0 users
+
+One of our users using the version `2.1.0` version reports a bug.
+
+We can simply commit the bug fix with the message `fix: another fix` to `master`. When pushing that commit, **semantic-release** will release the version `2.1.1` on the dist-tag `@latest`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+*  | feat: drop Node.js 6 support \n\n BREAKING CHANGE: Node.js >= 8 required # => v2.0.0 on @latest
+|  | \
+|  *  | feat: a feature # => v1.1.0 on @1.x
+|  |  * fix: a fix # => v1.0.1 on @1.0.x
+|  | /|
+|  *  | Merge branch 1.0.x into 1.x # => v1.1.1 on @1.x
+| /|  |
+*  |  | Merge branch 1.x into master # => v2.1.0 on @latest
+*  |  | fix: another fix # => v2.1.1 on @latest
+```
+
+## Porting a bug fix from master to 1.x
+
+The bug fix `fix: another fix` also affects version `1.1.1` users, so we want to port it to the `1.x` branch.
+
+To do so we need to cherry pick our fix commit made on `master` (`fix: another fix`) into `1.x` with `git checkout 1.x && git cherry-pick <sha of fix: another fix>`. As `master` and `1.x` branches have diverged, the cherry picking might require to resolve conflicts.
+
+Once the conflicts are resolved and the commit is pushed to `1.x`, **semantic-release** will release the version `1.1.2` on the dist-tag `@release-1.x` which contains `feat: a feature`, `fix: a fix` and `fix: another fix` but not `feat: drop Node.js 6 support \n\n BREAKING CHANGE: Node.js >= 8 required`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+*  | feat: drop Node.js 6 support \n\n BREAKING CHANGE: Node.js >= 8 required # => v2.0.0 on @latest
+|  | \
+|  *  | feat: a feature # => v1.1.0 on @1.x
+|  |  * fix: a fix # => v1.0.1 on @1.0.x
+|  | /|
+|  *  | Merge branch 1.0.x into 1.x # => v1.1.1 on @1.x
+| /|  |
+*  |  | Merge branch 1.x into master # => v2.1.0 on @latest
+*  |  | fix: another fix # => v2.1.1 on @latest
+|  |  |
+|  *  | fix: another fix # => v1.1.2 on @1.x
+```
@@ -0,0 +1,196 @@
+# Publishing pre-releases
+
+This recipe will walk you through a simple example that uses pre-releases to publish beta versions while working on a future major release and then make only one release on the default distribution.
+
+This example uses the **semantic-release** default configuration:
+- [branches](../usage/configuration.md#branches): `['+([0-9])?(.{+([0-9]),x}).x', 'master', 'next', 'next-major', {name: 'beta', prerelease: true}, {name: 'alpha', prerelease: true}]`
+- [plugins](../usage/configuration.md#plugins): `['@semantic-release/commit-analyzer', '@semantic-release/release-notes-generator', '@semantic-release/npm', '@semantic-release/github']`
+
+## Initial release
+
+We'll start by making the first commit of the project, with the code for the initial release and the message `feat: initial commit`. When pushing that commit, on `master` **semantic-release** will release the version `1.0.0` and make it available on the default distribution channel which is the dist-tag `@latest` for npm.
+
+The Git history of the repository is:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+```
+
+## Working on a future release
+
+We now decide to work on a future major release, which will be composed of multiple features, some of them being breaking changes. We want to publish our package for each new feature developed for test purpose, however we do not want to increment our package version or make it available to our users until all the features are developed and tested.
+
+To implement that workflow we can create the branch `beta` and commit our first feature there. When pushing that commit, **semantic-release** will publish the pre-release version `2.0.0-beta.1` on the dist-tag `@beta`. That allow us to run integration tests by installing our module with `npm install example-module@beta`. Other users installing with `npm install example-module` will still receive the version `1.0.0`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+|  * feat: first feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0-beta.1 on @beta
+```
+
+We can continue to work on our future release by committing and pushing other features or bug fixes on the `beta` branch. With each push, **semantic-release** will publish a new pre-release on the dist-tag `@beta`, which allow us to run our integration tests.
+
+With another feature, the Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+|  * feat: first feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0-beta.1 on @beta
+|  * feat: second feature # => v2.0.0-beta.2 on @beta
+```
+
+## Releasing a bug fix on the default distribution channel
+
+In the meantime we can also continue to commit changes and release updates to our users.
+
+For example, we can commit a bug fix with the message `fix: a fix` to `master`. When pushing that commit, **semantic-release** will release the version `1.0.1` on the dist-tag `@latest`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+|  * feat: first feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0-beta.1 on @beta
+|  * feat: second feature # => v2.0.0-beta.2 on @beta
+*  | fix: a fix # => v1.0.1 on @latest
+```
+
+## Working on another future release
+
+We now decide to work on another future major release, in parallel of the beta one, which will also be composed of multiple features, some of them being breaking changes.
+
+To implement that workflow we can create the branch `alpha` from the branch `beta` and commit our first feature there. When pushing that commit, **semantic-release** will publish the pre-release version `3.0.0-alpha.1` on the dist-tag `@alpha`. That allow us to run integration tests by installing our module with `npm install example-module@alpha`. Other users installing with `npm install example-module` will still receive the version `1.0.0`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+|  * feat: first feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0-beta.1 on @beta
+|  * feat: second feature # => v2.0.0-beta.2 on @beta
+*  | fix: a fix # => v1.0.1 on @latest
+|  | \
+|  |  * feat: first feature of other release \n\n BREAKING CHANGE: it breaks something # => v3.0.0-alpha.1 on @alpha
+```
+
+We can continue to work on our future release by committing and pushing other features or bug fixes on the `alpha` branch. With each push, **semantic-release** will publish a new pre-release on the dist-tag `@alpha`, which allow us to run our integration tests.
+
+With another feature, the Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+|  * feat: first feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0-beta.1 on @beta
+|  * feat: second feature # => v2.0.0-beta.2 on @beta
+*  | fix: a fix # => v1.0.1 on @latest
+|  | \
+|  |  * feat: first feature of other release \n\n BREAKING CHANGE: it breaks something # => v3.0.0-alpha.1 on @alpha
+|  |  * feat: second feature of other release # => v3.0.0-alpha.2 on @alpha
+```
+
+## Publishing the 2.0.0 beta release to the default distribution channel
+
+Once we've developed and pushed all the feature we want to include in the future version `2.0.0` in the `beta` branch and all our tests are successful we can release it to our users.
+
+To do so we need to merge our changes made on `beta` into `master`. As `beta` and `master` branches have diverged, this merge might require to resolve conflicts.
+
+Once the conflicts are resolved and the merge commit is pushed to `master`, **semantic-release** will release the version `2.0.0` on the dist-tag `@latest`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+|  * feat: first feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0-beta.1 on @beta
+|  * feat: second feature # => v2.0.0-beta.2 on @beta
+*  | fix: a fix # => v1.0.1 on @latest
+|  | \
+|  |  * feat: first feature of other release \n\n BREAKING CHANGE: it breaks something # => v3.0.0-alpha.1 on @alpha
+|  |  * feat: second feature of other release # => v3.0.0-alpha.2 on @alpha
+| /|  |
+*  |  | Merge branch beta into master # => v2.0.0 on @latest
+```
+
+## Publishing the 3.0.0 alpha release to the beta distribution channel
+
+Now that we published our the version `2.0.0` that was previously in beta, we decide to promote the version `3.0.0` in alpha to beta.
+
+To do so we need to merge our changes made on `alpha` into `beta`. There should be no conflict as `alpha` is strictly ahead of `master`.
+
+Once the merge commit is pushed to `beta`, **semantic-release** will publish the pre-release version `3.0.0-beta.1` on the dist-tag `@beta`, which allow us to run our integration tests.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+|  * feat: first feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0-beta.1 on @beta
+|  * feat: second feature # => v2.0.0-beta.2 on @beta
+*  | fix: a fix # => v1.0.1 on @latest
+|  | \
+|  |  * feat: first feature of other release \n\n BREAKING CHANGE: it breaks something # => v3.0.0-alpha.1 on @alpha
+|  |  * feat: second feature of other release # => v3.0.0-alpha.2 on @alpha
+| /|  |
+*  |  | Merge branch beta into master # => v2.0.0 on @latest
+|  | /|
+|  *  | Merge branch alpha into beta # => v3.0.0-beta.1 on @beta
+```
+
+## Publishing the 3.0.0 beta release to the default distribution channel
+
+Once we've developed and pushed all the feature we want to include in the future version `3.0.0` in the `beta` branch and all our tests are successful we can release it to our users.
+
+To do so we need to merge our changes made on `beta` into `master`. As `beta` and `master` branches have diverged, this merge might require to resolve conflicts.
+
+Once the conflicts are resolved and the merge commit is pushed to `master`, **semantic-release** will release the version `3.0.0` on the dist-tag `@latest`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+|  * feat: first feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0-beta.1 on @beta
+|  * feat: second feature # => v2.0.0-beta.2 on @beta
+*  | fix: a fix # => v1.0.1 on @latest
+|  | \
+|  |  * feat: first feature of other release \n\n BREAKING CHANGE: it breaks something # => v3.0.0-alpha.1 on @alpha
+|  |  * feat: second feature of other release # => v3.0.0-alpha.2 on @alpha
+| /|  |
+*  |  | Merge branch beta into master # => v2.0.0 on @latest
+|  | /|
+|  *  | Merge branch alpha into beta # => v3.0.0-beta.1 on @beta
+| /|  |
+*  |  | Merge branch beta into master # => v3.0.0 on @latest
+```
+
+## Working on a third future release
+
+We can now start to work on a new future major release, version `4.0.0`, on the `@beta` distribution channel.
+
+To do so we fist need to update the `beta` branch with all the changes from `master` (the commits `fix: a fix`). As `beta` and `master` branches have diverged, this merge might require to resolve conflicts.
+
+We can now commit our new feature on `beta`. When pushing that commit, **semantic-release** will publish the pre-release version `3.1.0-beta.1` on the dist-tag `@beta`. That allow us to run integration tests by installing our module with `npm install example-module@beta`. Other users installing with `npm install example-module` will still receive the version `3.0.0`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+|  * feat: first feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0-beta.1 on @beta
+|  * feat: second feature # => v2.0.0-beta.2 on @beta
+*  | fix: a fix # => v1.0.1 on @latest
+|  | \
+|  |  * feat: first feature of other release \n\n BREAKING CHANGE: it breaks something # => v3.0.0-alpha.1 on @alpha
+|  |  * feat: second feature of other release # => v3.0.0-alpha.2 on @alpha
+| /|  |
+*  |  | Merge branch beta into master # => v2.0.0 on @latest
+|  | /|
+|  *  | Merge branch alpha into beta # => v3.0.0-beta.1 on @beta
+| /|  |
+*  |  | Merge branch beta into master # => v3.0.0 on @latest
+| \|  |
+|  *  | Merge branch master into beta
+|  *  | feat: new feature # => v3.1.0-beta.1 on @beta
+```
@@ -222,7 +222,7 @@ If you need more control over the timing of releases, see [Triggering a release]

 This is not supported by **semantic-release** as it's not considered a good practice, mostly because [Semantic Versioning](https://semver.org) rules applies differently to major version zero.

-In early development phase when your package is not ready for production yet we recommend to publish releases on a distribution channel (for example npm’s [dist-tags](https://docs.npmjs.com/cli/dist-tag)) or to develop on a `dev` branch and merge it to `master` periodically. See [Triggering a release](../../README.md#triggering-a-release) for more details on those solutions.
+If your project is under heavy development, with frequent breaking changes, and is not production ready yet we recommend [publishing pre-releases](../recipes/pre-releases.md#publishing-pre-releases).

 See [“Introduction to SemVer” - Irina Gebauer](https://blog.greenkeeper.io/introduction-to-semver-d272990c44f2) for more details on [Semantic Versioning](https://semver.org) and the recommendation to start at version `1.0.0`.

@@ -1,7 +1,7 @@
 # Configuration

 **semantic-release** configuration consists of:
- Git repository options ([URL](#repositoryurl), [release branch](#branch) and [tag format](#tagformat))
+- Git repository options ([URL](#repositoryurl), [release branches](#branches) and [tag format](#tagformat))
 - [plugins](#plugins) definition
 - run mode ([debug](#debug), [dry run](#dryrun) and [local (no CI)](#ci))

@@ -25,7 +25,7 @@ Via `release` key in the project's `package.json` file:
 ```json
 {
  "release": {
-    "branch": "next"
+    "branches": ["master", "next"]
  }
 }
 ```
@@ -37,7 +37,7 @@ Via `.releaserc` file:

 ```json
 {
-  "branch": "next"
+  "branches": ["master", "next"]
 }
 ```
 ```bash
@@ -67,13 +67,25 @@ List of modules or file paths containing a [shareable configuration](shareable-c

 **Note**: Options defined via CLI arguments or in the configuration file will take precedence over the ones defined in any shareable configuration.

-### branch
+### branches

-Type: `String`<br>
-Default: `master`<br>
-CLI arguments: `-b`, `--branch`
+Type: `Array`, `String`, `Object`<br>
+Default: `['+([0-9])?(.{+([0-9]),x}).x', 'master', 'next', 'next-major', {name: 'beta', prerelease: true}, {name: 'alpha', prerelease: true}]`<br>
+CLI arguments: `--branches`

-The branch on which releases should happen.
+The branches on which releases should happen. By default **semantic-release** will release:
+- regular releases to the default distribution channel from the branch `master`
+- regular releases to a distribution channel matching the branch name from any existing branch with a name matching a maintenance release range (`N.N.x` or `N.x.x` or `N.x` with `N` being a number)
+- regular releases to the `next` distribution channel from the branch `next` if it exists
+- regular releases  to the `next-major` distribution channel from the branch `next-major` if it exists
+- prereleases to the `beta` distribution channel from the branch `beta` if it exists
+- prereleases to the `alpha` distribution channel from the branch `alpha` if it exists
+
+**Note**: If your repository does not have a release branch, then **semantic-release** will fail with an `ERELEASEBRANCHES` error message. If you are using the default configuration, you can fix this error by pushing a `master` branch.
+
+**Note**: Once **semantic-release** is configured, any user with the permission to push commits on one of those branches will be able to publish a release. It is recommended to protect those branches, for example with [GitHub protected branches](https://help.github.com/articles/about-protected-branches).
+
+See [Plugins configuration](plugins.md#plugins) for more details.

 ### repositoryUrl

@@ -146,7 +158,7 @@ Output debugging information. This can also be enabled by setting the `DEBUG` en

 ## Existing version tags

-**semantic-release** uses [Git tags](https://git-scm.com/book/en/v2/Git-Basics-Tagging) to determine the commits added since the last release. If a release has been published before setting up **semantic-release** you must make sure the most recent commit included in the last published release is in the [release branch](#branch) history and is tagged with the version released, formatted according to the [tag format](#tagformat) configured (defaults to `vx.y.z`).
+**semantic-release** uses [Git tags](https://git-scm.com/book/en/v2/Git-Basics-Tagging) to determine the commits added since the last release. If a release has been published before setting up **semantic-release** you must make sure the most recent commit included in the last published release is in the [release branches](#branches) history and is tagged with the version released, formatted according to the [tag format](#tagformat) configured (defaults to `vx.y.z`).

 If the previous releases were published with [`npm publish`](https://docs.npmjs.com/cli/publish) this should already be the case.

@@ -1,6 +1,6 @@
 # Getting started

-In order to use **semantic-release** you must follow these steps:
+In order to use **semantic-release** you must follows this steps:
 - [Install](./installation.md#installation) **semantic-release** in your project
 - Configure your Continuous Integration service to [run **semantic-release**](./ci-configuration.md#run-semantic-release-only-after-all-tests-succeeded)
 - Configure your Git repository and package manager repository [authentication](ci-configuration.md#authentication) in your Continuous Integration service
@@ -19,4 +19,4 @@ semantic-release-cli setup

 See the [semantic-release-cli](https://github.com/semantic-release/cli#what-it-does) documentation for more details.

-**Note**: only a limited number of options, CI services and plugins are currently supported by `semantic-release-cli`.
+**Note**: only a limited number of options, CI services and plugins is currently supported by `semantic-release-cli`.
@@ -17,26 +17,15 @@ A plugin is a npm module that can implement one or more of the following steps:

 **Note:** If no plugin with a `analyzeCommits` step is defined `@semantic-release/commit-analyzer` will be used.

-## Plugins installation
-
-These five plugins are already part of **semantic-release** and don't have to be installed separately:
-```
-"@semantic-release/commit-analyzer"	
-"@semantic-release/error"	
-"@semantic-release/github"	
-"@semantic-release/npm"	
-"@semantic-release/release-notes-generator"
-```
-
-[Additional plugins](../extending/plugins-list.md) have to be installed via npm:
-
-```bash
-$ npm install @semantic-release/git @semantic-release/changelog -D
-```
+See [available plugins](../extending/plugins-list.md).

 ## Plugins configuration

-Each plugin must be configured with the [`plugins` options](./configuration.md#plugins) by specifying the list of plugins by npm module name.
+Each plugin must be installed and configured with the [`plugins` options](./configuration.md#plugins) by specifying the list of plugins by npm module name.
+
+```bash
+$ npm install @semantic-release/commit-analyzer @semantic-release/release-notes-generator @semantic-release/npm -D
+```

 ```json
 {
@@ -0,0 +1,187 @@
+# Workflow configuration
+
+**semantic-release** allow to manage and automate complex release workflow, based on multiple Git branches and distribution channels. This allow to:
+- Distributes certain releases to a particular group of users via distribution channels
+- Manage the availability of releases on distribution channels via branches merge
+- Maintain multiple lines of releases in parallel
+- Work on large future releases outside the normal flow of one version increment per Git push
+
+See [Release workflow recipes](../recipes/README.md#release-workflow) for detailed examples.
+
+The release workflow is configured via the [branches option](./configuration.md#branches) which accepts a single or an array of branch definitions.
+Each branch can be defined either as a string, a [glob](https://github.com/micromatch/micromatch#matching-features) or an object. For string and glob definitions each [property](#branches-properties) will be defaulted.
+
+A branch can defined as one of three types:
+- [release](#release-branches): to make releases on top of the last version released
+- [maintenance](#maintenance-branches): to make release on top of an old release
+- [pre-release](#pre-release-branches): to make pre-releases
+
+The type of the branch is automatically determined based on naming convention and/or [properties](#branches-properties).
+
+## Branches properties
+
+| Property     | Branch type                               | Description                                                                                                                                                                             | Default                                                                                         |
+|--------------|-------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------|
+| `name`       | All                                       | **Required.** The Git branch holding the commits to analyze and the code to release. See [name](#name).                                                                                 | - The value itself if defined as a `String` or the matching branches name if defined as a glob. |
+| `channel`    | All                                       | The distribution channel on which to publish releases from this branch. Set to `false` to force the default distribution channel instead of using the default. See [channel](#channel). | `undefined` for the first release branch, the value of `name` for subsequent ones.              |
+| `range`      | [maintenance](#maintenance-branches) only | **Required unless `name` is formatted like `N.N.x` or `N.x` (`N` is a number).** The range of [semantic versions](https://semver.org) to support on this branch. See [range](#range).   | The value of `name`.                                                                            |
+| `prerelease` | [pre-release](#pre-release-branches) only | **Required.** The pre-release detonation to append to [semantic versions](https://semver.org) released from this branch. See [prerelease](#prerelease).                                 | -                                                                                               |
+
+### name
+
+A `name` is required for any type of branch.
+It can be defined as a [glob](https://github.com/micromatch/micromatch#matching-features) in which case the definition will be expanded to one per matching branch existing in the repository.
+
+If `name` doesn't match to any branch existing in the repository, the definition will be ignored. For example the default configuration includes the definition `next` and `next-major` which will become active only when the branches `next` and/or `next-major` are created in the repository. This allow to define your workflow once with all potential branches you might use and have the effective configuration evolving as you create new branches.
+
+For example the configuration `['+([0-9])?(.{+([0-9]),x}).x', 'master', 'next']` will be expanded as:
+```js
+{
+  branches: [
+    {name: '1.x', range: '1.x', channel: '1.x'}, // Only after the `1.x` is created in the repo
+    {name: '2.x', range: '2.x', channel: '2.x'}, // Only after the `2.x` is created in the repo
+    {name: 'master'},
+    {name: 'next', channel: 'next'}, // Only after the `next` is created in the repo
+  ]
+}
+```
+
+### channel
+
+The `channel` can be defined for any branch type. If it's not defined, releases will be done on the default distribution channel (for example the `@latest` [dist-tag](https://docs.npmjs.com/cli/dist-tag) for npm).
+The value of `channel`, if defined, is generated with [Lodash template](https://lodash.com/docs#template) with the variable `name` available.
+
+For example the configuration `['master', {name: 'next', channel: 'channel-${name}'}]` will be expanded as:
+```js
+{
+  branches: [
+    {name: 'master'}, // `channel` is undefined so the default distribution channel will be used
+    {name: 'next', channel: 'channel-next'}, // `channel` is built with the template `channel-${name}`
+  ]
+}
+```
+
+### range
+
+A `range` only applies to maintenance branches, is required and must be formatted like `N.N.x` or `N.x` (`N` is a number). In case the `name` is formatted as a range (for example `1.x` or `1.5.x`) the branch will be considered a maintenance branch and the `name` value will be used for the `range`.
+
+For example the configuration `['1.1.x', '1.2.x', 'master']` will be expanded as:
+```js
+{
+  branches: [
+    {name: '1.1.x', range: '1.1.x', channel: '1.1.x'},
+    {name: '1.2.x', range: '1.2.x', channel: '1.2.x'},
+    {name: 'master'},
+  ]
+}
+```
+
+### prerelease
+
+A `prerelease` property applies only to pre-release branches, is required and The `prerelease` value must be valid per the [Semantic Versioning Specification](https://semver.org/#spec-item-9). It will determine the name of versions (for example if `prerelease` is set to `beta` the version be formatted like `2.0.0-beta.1`, `2.0.0-beta.2` etc...).
+If the `prerelease` property is set to `true` the `name` value will be used.
+
+The value of `prerelease`, if defined as a string, is generated with [Lodash template](https://lodash.com/docs#template) with the variable `name` available.
+
+For example the configuration `['master', {name: 'pre/rc', prerelease: '${name.replace(/^pre\\//g, "")}'}, {name: 'beta', prerelease: true}]` will be expanded as:
+```js
+{
+  branches: [
+    {name: 'master'},
+    {name: 'pre/rc', channel: 'pre/rc', prerelease: 'rc'}, // `prerelease` is built with the template `${name.replace(/^pre\\//g, "")}`
+    {name: 'beta', channel: 'beta', prerelease: 'beta'}, // `prerelease` is set to `beta` as it is the value of `name`
+  ]
+}
+```
+
+## Branch types
+
+### Release branches
+
+A release branch is the base type of branch used by **semantic-release** that allows to publish releases with a [semantic version](https://semver.org), optionally on a specific distribution channel. Distribution channels (for example [npm dist-tags](https://docs.npmjs.com/cli/dist-tag) or [Chrome release channels](https://www.chromium.org/getting-involved/dev-channel)) are a way to distribute new releases only to a subset of users in order to get early feedback. Later on those releases can be added to the general distribution channel to be made available to all users.
+
+**semantic-release** will automatically add releases to the corresponding distribution channel when code is [merged from a release branch to another](#merging-into-a-release-branch).
+
+A project must define a minimum of 1 release branch and can have a maximum of 3. The order of the release branch definitions is significant, as versions released on a given branch must always be higher than the last release made on the previous branch. This allow to avoid situation that would lead to an attempt to publish releases with the same version number but different codebase. When multiple release branches are configured and a commit that would create a version conflict is pushed, **semantic-release** will not perform the release and will throw an `EINVALIDNEXTVERSION` error, listing the problematic commits and the valid branches on which to move them.
+
+**Note:** With **semantic-release** as with most package managers, a release version must be unique, independently of the distribution channel on which it is available.
+
+See [publishing on distribution channels recipe](../recipes/distribution-channels.md) for a detailed example.
+
+#### Pushing to a release branch
+
+With the configuration `"branches": ["master", "next"]`, if the last release published from `master` is `1.0.0` then:
+- Only versions in range `1.x.x` can be published from `master`, so only `fix` and `feat` commits can be pushed to `master`
+- Only versions in range `>=2.0.0` release can be published from `next`, so a `BREAKING CHANGE` commit must be pushed first on `next` and can be followed by any type of commits
+
+With the configuration `"branches": ["master", "next", "next-major"]`, if the last release published from `master` is `1.0.0` then:
+- Only versions in range `1.0.x` can be published from `master`, so only `fix` commits can be pushed to `master`
+- Only versions in range `>=1.1.0` can be published from `next`, so a `feat` commit must be pushed first on `next` and can be followed by `fix` and `feat` commits
+- Only versions in range `>=2.0.0` release can be published from `next`, so a `BREAKING CHANGE` commit must be pushed first on `next-major` and can be followed by any type of commits
+
+Those verifications prevent situations such as:
+1. Create a `feat` commit on `next` which triggers the release of version `1.0.0` on channel `next`
+2. Merge `next` into `master` which adds `1.0.0` on the default channel
+3. Push a `fix` commit to `master` which triggers the release of version `1.0.1` on the default channel
+4. Push a `fix` commit to `next` which would attempt to release the version `1.0.1` on channel `next` and fails as this version already exists
+
+#### Merging into a release branch
+
+When merging commits associated with a release from one release branch to another, **semantic-release** will make the corresponding version available on the channel associated with the target branch.
+
+When merging commits not associated with a release, commits from a [maintenance branch](#maintenance-branches) or commits from a [pre-release branch](#pre-release-branches) **semantic-release** will treat them as [pushed commits](#pushing-to-a-release-branch) and publish a new release if necessary.
+
+### Maintenance branches
+
+A maintenance branch is a type of branch used by **semantic-release** that allows to publish releases with a [semantic version](https://semver.org) on top of the codebase of an old release. This is useful when you need to provide fixes or features to users who cannot upgrade to the last version of your package.
+
+A maintenance branch is characterized by a range which defines the versions that can be published from it. The [`range`](#range) value of each maintenance branch must be unique across the project.
+
+**semantic-release** will always publish releases to a distribution channel specific to the range, so only the users who choose to use that particular line of versions will receive new releases.
+
+Maintenance branches are always considered lower than [release branches](#release-branches) and similarly to them, when a commit that would create a version conflict is pushed, **semantic-release** will not perform the release and will throw an `EINVALIDNEXTVERSION` error, listing the problematic commits and the valid branches on which to move them.
+
+**semantic-release** will automatically add releases to the corresponding distribution channel when code is [merged from a release or maintenance branch to another maintenance branch](#merging-into-a-maintenance-branch), however only version version within the branch `range` can be merged. Ia merged version is outside the maintenance branch `range` **semantic-release** will not add to the corresponding channel and will throw an `EINVALIDMAINTENANCEMERGE` error.
+
+See [publishing maintenance releases recipe](../recipes/maintenance-releases.md) for a detailed example.
+
+#### Pushing to a maintenance branch
+
+With the configuration `"branches": ["1.0.x", "1.x", "master"]`, if the last release published from `master` is `1.5.0` then:
+- Only versions in range `>=1.0.0 <1.1.0` can be published from `1.0.x`, so only `fix` commits can be pushed to `1.0.x`
+- Only versions in range `>=1.1.0 <1.5.0` can be published from `1.x`, so only `fix` and `feat` commits can be pushed to `1.x` as long the resulting release is lower than `1.5.0`
+- Once `2.0.0` is released from `master`, versions in range `>=1.1.0 <2.0.0` can be published from `1.x`, so any number of `fix` and `feat` commits can be pushed to `1.x`
+
+#### Merging into a maintenance branch
+
+With the configuration `"branches": ["1.0.x", "1.x", "master"]`, if the last release published from `master` is `1.0.0` then:
+- Creating the branch `1.0.x` from `master` will make the `1.0.0` release available on the `1.0.x` distribution channel
+- Pushing a `fix` commit on the `1.0.x` branch will release the version `1.0.1` on the `1.0.x` distribution channel
+- Creating the branch `1.x` from `master` will make the `1.0.0` release available on the `1.x` distribution channel
+- Merging the branch `1.0.x` into `1.x` will make the version `1.0.1` available on the `1.x` distribution channel
+
+### Pre-release branches
+
+A pre-release branch is a type of branch used by **semantic-release** that allows to publish releases with a [pre-release version](https://semver.org/#spec-item-9).
+Using a pre-release version allow to publish multiple releases with the same version. Those release will be differentiated via there identifiers (in `1.0.0-alpha.1` the identifier is `alpha.1`).
+This is useful when you need to work on a future major release that will include many breaking changes but you do not want to increment the version number for each breaking change commit.
+
+A pre-release branch is characterized by the `prerelease` property that defines the static part of the version released (in `1.0.0-alpha.1` the static part fo the identifier is `alpha`). The [`prerelease`](#prerelease) value of each pre-release branch must be unique across the project.
+
+**semantic-release** will always publish pre-releases to a specific distribution channel, so only the users who choose to use that particular line of versions will receive new releases.
+
+When merging commits associated with an existing release, **semantic-release** will treat them as [pushed commits](#pushing-to-a-pre-release-branch) and publish a new release if necessary, but it will never add those releases to the distribution channel corresponding to the pre-release branch.
+
+See [publishing pre-releases recipe](../recipes/pre-releases.md) for a detailed example.
+
+#### Pushing to a pre-release branch
+
+With the configuration `"branches": ["master", {"name": "beta", "prerelease": true}]`, if the last release published from `master` is `1.0.0` then:
+- Pushing a `BREAKING CHANGE` commit on the `beta` branch will release the version `2.0.0-beta.1` on the `beta` distribution channel
+- Pushing either a `fix`, `feat` or a `BREAKING CHANGE` commit on the `beta` branch will release the version `2.0.0-beta.2` (then `2.0.0-beta.3`, `2.0.0-beta.4`, etc...) on the `beta` distribution channel
+
+#### Merging into a pre-release branch
+
+With the configuration `"branches": ["master", {"name": "beta", "prerelease": true}]`, if the last release published from `master` is `1.0.0` and the last one published from `beta` is `2.0.0-beta.1` then:
+- Pushing a `fix` commit on the `master` branch will release the version `1.0.1` on the default distribution channel
+- Merging the branch `master` into `beta` will release the version `2.0.0-beta.2` on the `beta` distribution channel
@@ -1,8 +1,11 @@
-const {template, pick} = require('lodash');
+const {pick} = require('lodash');
 const marked = require('marked');
 const TerminalRenderer = require('marked-terminal');
 const envCi = require('env-ci');
 const hookStd = require('hook-std');
+const pEachSeries = require('p-each-series');
+const semver = require('semver');
+const AggregateError = require('aggregate-error');
 const pkg = require('./package.json');
 const hideSensitive = require('./lib/hide-sensitive');
 const getConfig = require('./lib/get-config');
@@ -10,15 +13,18 @@ const verify = require('./lib/verify');
 const getNextVersion = require('./lib/get-next-version');
 const getCommits = require('./lib/get-commits');
 const getLastRelease = require('./lib/get-last-release');
-const {extractErrors} = require('./lib/utils');
+const getReleasesToAdd = require('./lib/get-releases-to-add');
+const {extractErrors, makeTag} = require('./lib/utils');
 const getGitAuthUrl = require('./lib/get-git-auth-url');
+const getBranches = require('./lib/branches');
 const getLogger = require('./lib/get-logger');
-const {fetch, verifyAuth, isBranchUpToDate, getGitHead, tag, push} = require('./lib/git');
+const {verifyAuth, isBranchUpToDate, getGitHead, tag, push} = require('./lib/git');
 const getError = require('./lib/get-error');
 const {COMMIT_NAME, COMMIT_EMAIL} = require('./lib/definitions/constants');

 marked.setOptions({renderer: new TerminalRenderer()});

+/* eslint complexity: ["warn", 25] */
 async function run(context, plugins) {
  const {cwd, env, options, logger} = context;
  const {isCi, branch: ciBranch, isPr} = envCi({env, cwd});
@@ -44,11 +50,18 @@ async function run(context, plugins) {
    return false;
  }

-  if (ciBranch !== options.branch) {
+  // Verify config
+  await verify(context);
+
+  options.repositoryUrl = await getGitAuthUrl(context);
+  context.branches = await getBranches(options.repositoryUrl, context);
+  context.branch = context.branches.find(({name}) => name === ciBranch);
+
+  if (!context.branch) {
    logger.log(
-      `This test run was triggered on the branch ${ciBranch}, while semantic-release is configured to only publish from ${
-        options.branch
-      }, therefore a new version won’t be published.`
+      `This test run was triggered on the branch ${ciBranch}, while semantic-release is configured to only publish from ${context.branches
+        .map(({name}) => name)
+        .join(', ')}, therefore a new version won’t be published.`
    );
    return false;
  }
@@ -57,17 +70,13 @@ async function run(context, plugins) {
    `Run automated release from branch ${ciBranch}${options.dryRun ? ' in dry-run mode' : ''}`
  );

-  await verify(context);
-
-  options.repositoryUrl = await getGitAuthUrl(context);
-
  try {
    try {
-      await verifyAuth(options.repositoryUrl, options.branch, {cwd, env});
+      await verifyAuth(options.repositoryUrl, context.branch.name, {cwd, env});
    } catch (error) {
-      if (!(await isBranchUpToDate(options.branch, {cwd, env}))) {
+      if (!(await isBranchUpToDate(options.repositoryUrl, context.branch.name, {cwd, env}))) {
        logger.log(
-          `The local branch ${options.branch} is behind the remote one, therefore a new version won't be published.`
+          `The local branch ${context.branch.name} is behind the remote one, therefore a new version won't be published.`
        );
        return false;
      }
@@ -76,28 +85,80 @@ async function run(context, plugins) {
    }
  } catch (error) {
    logger.error(`The command "${error.cmd}" failed with the error message ${error.stderr}.`);
-    throw getError('EGITNOPERMISSION', {options});
+    throw getError('EGITNOPERMISSION', context);
  }

  logger.success(`Allowed to push to the Git repository`);

  await plugins.verifyConditions(context);

-  await fetch(options.repositoryUrl, {cwd, env});
+  const releasesToAdd = getReleasesToAdd(context);
+  const errors = [];
+  context.releases = [];
+
+  await pEachSeries(releasesToAdd, async ({lastRelease, currentRelease, nextRelease}) => {
+    if (context.branch.mergeRange && !semver.satisfies(nextRelease.version, context.branch.mergeRange)) {
+      errors.push(getError('EINVALIDMAINTENANCEMERGE', {...context, nextRelease}));
+      return;
+    }
+
+    const commits = await getCommits({...context, lastRelease, nextRelease});
+    nextRelease.notes = await plugins.generateNotes({...context, commits, lastRelease, nextRelease});
+
+    logger.log('Create tag %s', nextRelease.gitTag);
+    await tag(nextRelease, {cwd, env});
+    await push(options.repositoryUrl, {cwd, env});
+    context.branch.tags.push({
+      version: nextRelease.version,
+      channel: nextRelease.channel,
+      gitTag: nextRelease.gitTag,
+      gitHead: nextRelease.gitHead,
+    });
+
+    const releases = await plugins.addChannel({...context, commits, lastRelease, currentRelease, nextRelease});
+    context.releases.push(...releases);
+    await plugins.success({...context, lastRelease, commits, nextRelease, releases});
+  });
+
+  if (errors.length > 0) {
+    throw new AggregateError(errors);
+  }

  context.lastRelease = await getLastRelease(context);
+
+  if (context.lastRelease.gitTag) {
+    logger.log(
+      `Found git tag ${context.lastRelease.gitTag} associated with version ${context.lastRelease.version} on branch ${context.branch.name}`
+    );
+  } else {
+    logger.log(`No git tag version found on branch ${context.branch.name}`);
+  }
+
  context.commits = await getCommits(context);

-  const nextRelease = {type: await plugins.analyzeCommits(context), gitHead: await getGitHead({cwd, env})};
-
+  const nextRelease = {
+    type: await plugins.analyzeCommits(context),
+    channel: context.branch.channel,
+    gitHead: await getGitHead({cwd, env}),
+  };
  if (!nextRelease.type) {
    logger.log('There are no relevant changes, so no new version is released.');
-    return false;
+    return context.releases.length > 0 ? {releases: context.releases} : false;
  }

  context.nextRelease = nextRelease;
  nextRelease.version = getNextVersion(context);
-  nextRelease.gitTag = template(options.tagFormat)({version: nextRelease.version});
+  nextRelease.gitTag = makeTag(options.tagFormat, nextRelease.version, nextRelease.channel);
+  nextRelease.name = makeTag(options.tagFormat, nextRelease.version);
+
+  if (context.branch.type !== 'prerelease' && !semver.satisfies(nextRelease.version, context.branch.range)) {
+    throw getError('EINVALIDNEXTVERSION', {
+      ...context,
+      validBranches: context.branches.filter(
+        ({type, accept}) => type !== 'prerelease' && accept.includes(nextRelease.type)
+      ),
+    });
+  }

  await plugins.verifyRelease(context);

@@ -109,14 +170,15 @@ async function run(context, plugins) {
    logger.warn(`Skip ${nextRelease.gitTag} tag creation in dry-run mode`);
  } else {
    // Create the tag before calling the publish plugins as some require the tag to exists
-    await tag(nextRelease.gitTag, {cwd, env});
+    await tag(nextRelease, {cwd, env});
    await push(options.repositoryUrl, {cwd, env});
    logger.success(`Created tag ${nextRelease.gitTag}`);
  }

-  context.releases = await plugins.publish(context);
+  const releases = await plugins.publish(context);
+  context.releases.push(...releases);

-  await plugins.success(context);
+  await plugins.success({...context, releases});

  logger.success(`Published release ${nextRelease.version}`);

@@ -0,0 +1,18 @@
+const {isString, remove, omit, mapValues, template} = require('lodash');
+const micromatch = require('micromatch');
+const {getBranches} = require('../git');
+
+module.exports = async (repositoryUrl, {cwd}, branches) => {
+  const gitBranches = await getBranches(repositoryUrl, {cwd});
+
+  return branches.reduce(
+    (branches, branch) => [
+      ...branches,
+      ...remove(gitBranches, name => micromatch(gitBranches, branch.name).includes(name)).map(name => ({
+        name,
+        ...mapValues(omit(branch, 'name'), value => (isString(value) ? template(value)({name}) : value)),
+      })),
+    ],
+    []
+  );
+};
@@ -0,0 +1,39 @@
+const {template, escapeRegExp} = require('lodash');
+const semver = require('semver');
+const pReduce = require('p-reduce');
+const debug = require('debug')('semantic-release:get-tags');
+const {getTags, isRefInHistory, getTagHead} = require('../../lib/git');
+
+module.exports = async ({cwd, env, options: {tagFormat}}, branches) => {
+  // Generate a regex to parse tags formatted with `tagFormat`
+  // by replacing the `version` variable in the template by `(.+)`.
+  // The `tagFormat` is compiled with space as the `version` as it's an invalid tag character,
+  // so it's guaranteed to no be present in the `tagFormat`.
+  const tagRegexp = `^${escapeRegExp(template(tagFormat)({version: ' '})).replace(' ', '(.[^@]+)@?(.+)?')}`;
+  const tags = (await getTags({cwd, env}))
+    .map(tag => {
+      const [, version, channel] = tag.match(tagRegexp) || [];
+      return {gitTag: tag, version, channel};
+    })
+    .filter(({version}) => version && semver.valid(semver.clean(version)));
+
+  debug('found tags: %o', tags);
+
+  return pReduce(
+    branches,
+    async (branches, branch) => {
+      const branchTags = await pReduce(
+        tags,
+        async (tags, {gitTag, ...rest}) =>
+          (await isRefInHistory(gitTag, branch.name, true, {cwd, env}))
+            ? [...tags, {...rest, gitTag, gitHead: await getTagHead(gitTag, {cwd, env})}]
+            : tags,
+        []
+      );
+
+      debug('found tags for branch %s: %o', branch.name, branchTags);
+      return [...branches, {...branch, tags: branchTags}];
+    },
+    []
+  );
+};
@@ -0,0 +1,68 @@
+const {isString, isRegExp} = require('lodash');
+const AggregateError = require('aggregate-error');
+const pEachSeries = require('p-each-series');
+const DEFINITIONS = require('../definitions/branches');
+const getError = require('../get-error');
+const {fetch, verifyBranchName} = require('../git');
+const expand = require('./expand');
+const getTags = require('./get-tags');
+const normalize = require('./normalize');
+
+module.exports = async (repositoryUrl, context) => {
+  const {cwd, env} = context;
+
+  const remoteBranches = await expand(
+    repositoryUrl,
+    context,
+    context.options.branches.map(branch => (isString(branch) || isRegExp(branch) ? {name: branch} : branch))
+  );
+
+  await pEachSeries(remoteBranches, async ({name}) => {
+    await fetch(repositoryUrl, name, {cwd, env});
+  });
+
+  const branches = await getTags(context, remoteBranches);
+
+  const errors = [];
+  const branchesByType = Object.entries(DEFINITIONS).reduce(
+    (branchesByType, [type, {filter}]) => ({[type]: branches.filter(filter), ...branchesByType}),
+    {}
+  );
+
+  const result = Object.entries(DEFINITIONS).reduce((result, [type, {branchesValidator, branchValidator}]) => {
+    branchesByType[type].forEach(branch => {
+      if (branchValidator && !branchValidator(branch)) {
+        errors.push(getError(`E${type.toUpperCase()}BRANCH`, {branch}));
+      }
+    });
+
+    const branchesOfType = normalize[type](branchesByType);
+
+    if (!branchesValidator(branchesOfType)) {
+      errors.push(getError(`E${type.toUpperCase()}BRANCHES`, {branches: branchesOfType}));
+    }
+
+    return {...result, [type]: branchesOfType};
+  }, {});
+
+  const duplicates = [...branches]
+    .map(branch => branch.name)
+    .sort()
+    .filter((val, idx, arr) => arr[idx] === arr[idx + 1] && arr[idx] !== arr[idx - 1]);
+
+  if (duplicates.length > 0) {
+    errors.push(getError('EDUPLICATEBRANCHES', {duplicates}));
+  }
+
+  await pEachSeries(branches, async branch => {
+    if (!(await verifyBranchName(branch.name))) {
+      errors.push(getError('EINVALIDBRANCHNAME', branch));
+    }
+  });
+
+  if (errors.length > 0) {
+    throw new AggregateError(errors);
+  }
+
+  return [...result.maintenance, ...result.release, ...result.prerelease];
+};
@@ -0,0 +1,112 @@
+const {sortBy, isNil} = require('lodash');
+const semver = require('semver');
+const semverDiff = require('semver-diff');
+const {FIRST_RELEASE, RELEASE_TYPE} = require('../definitions/constants');
+const {
+  tagsToVersions,
+  isMajorRange,
+  getUpperBound,
+  getLowerBound,
+  highest,
+  lowest,
+  getLatestVersion,
+  getFirstVersion,
+  getRange,
+} = require('../utils');
+
+function maintenance({maintenance, release}) {
+  return sortBy(
+    maintenance.map(({name, range, channel, ...rest}) => ({
+      ...rest,
+      name,
+      range: range || name,
+      channel: isNil(channel) ? name : channel,
+    })),
+    'range'
+  ).map(({name, range, tags, ...rest}, idx, branches) => {
+    const versions = tagsToVersions(tags);
+    // Find the lower bound based on Maintenance branches
+    const maintenanceMin =
+      // If the current branch has a major range (1.x or 1.x.x) and the previous doesn't
+      isMajorRange(range) && branches[idx - 1] && !isMajorRange(branches[idx - 1].range)
+        ? // Then the lowest bound is the upper bound of the previous branch range
+          getUpperBound(branches[idx - 1].range)
+        : // Otherwise the lowest bound is the lowest bound of the current branch range
+          getLowerBound(range);
+    // The actual lower bound is the highest version between the current branch last release and `maintenanceMin`
+    const min = highest(getLatestVersion(versions) || FIRST_RELEASE, maintenanceMin);
+    // Determine the first release of the default branch not present in any maintenance branch
+    const base =
+      (release[0] &&
+        (getFirstVersion(tagsToVersions(release[0].tags), branches) ||
+          getLatestVersion(tagsToVersions(release[0].tags)))) ||
+      FIRST_RELEASE;
+    // The upper bound is the lowest version between the `base` version and the upper bound of the current branch range
+    const max = lowest(base, getUpperBound(range));
+    const diff = semverDiff(min, max);
+    return {
+      ...rest,
+      type: 'maintenance',
+      name,
+      tags,
+      range: getRange(min, max),
+      accept: diff ? RELEASE_TYPE.slice(0, RELEASE_TYPE.indexOf(diff)) : [],
+      mergeRange: getRange(maintenanceMin, getUpperBound(range)),
+    };
+  });
+}
+
+function release({release}) {
+  if (release.length === 0) {
+    return release;
+  }
+
+  const breakpoints = release.length > 2 ? ['minor', 'major'] : ['major'];
+
+  // The intial bound is the last release from the base branch of `FIRST_RELEASE` (1.0.0)
+  let bound = getLatestVersion(tagsToVersions(release[0].tags)) || FIRST_RELEASE;
+
+  return release.map(({name, tags, channel, ...rest}, idx) => {
+    const versions = tagsToVersions(tags);
+    // The lower bound is the highest version between the current branch last release and the previous branch upper bound (`bound`)
+    const min = highest(getLatestVersion(versions), bound);
+    if (release.length - 1 === idx) {
+      // If the current branch is the last one of the release branch, there is no upper bound
+      bound = undefined;
+    } else {
+      // The default upper bound is the lower bound increment with the release type of the current branch position
+      const upperBound = semver.inc(min, breakpoints[idx]);
+      // Find the lowest version that is present on the current branch but none of the previous ones
+      const nextFirstVersion = getFirstVersion(tagsToVersions(release[idx + 1].tags), release.slice(0, idx + 1));
+      // The upper bound is the lowest version between `nextFirstVersion` and the default upper bound
+      bound = lowest(nextFirstVersion, upperBound);
+    }
+
+    const diff = bound ? semverDiff(min, bound) : null;
+    return {
+      ...rest,
+      channel: idx === 0 ? channel : isNil(channel) ? name : channel,
+      tags,
+      type: 'release',
+      name,
+      range: getRange(min, bound),
+      accept: bound ? RELEASE_TYPE.slice(0, RELEASE_TYPE.indexOf(diff)) : RELEASE_TYPE,
+    };
+  });
+}
+
+function prerelease({prerelease}) {
+  return prerelease.map(({name, prerelease, channel, tags, ...rest}) => {
+    const preid = prerelease === true ? name : prerelease;
+    return {
+      ...rest,
+      channel: isNil(channel) ? name : channel,
+      type: 'prerelease',
+      name,
+      prerelease: preid,
+      tags,
+    };
+  });
+}
+
+module.exports = {maintenance, release, prerelease};
@@ -0,0 +1,23 @@
+const {isUndefined, uniqBy} = require('lodash');
+const semver = require('semver');
+const {isMaintenanceRange} = require('../utils');
+
+const maintenance = {
+  filter: ({name, range}) => !isUndefined(range) || isMaintenanceRange(name),
+  branchValidator: ({range}) => (isUndefined(range) ? true : isMaintenanceRange(range)),
+  branchesValidator: branches => uniqBy(branches, ({range}) => semver.validRange(range)).length === branches.length,
+};
+
+const prerelease = {
+  filter: ({prerelease}) => !isUndefined(prerelease),
+  branchValidator: ({name, prerelease}) =>
+    Boolean(prerelease) && Boolean(semver.valid(`1.0.0-${prerelease === true ? name : prerelease}.1`)),
+  branchesValidator: branches => uniqBy(branches, 'prerelease').length === branches.length,
+};
+
+const release = {
+  filter: branch => !maintenance.filter(branch) && !prerelease.filter(branch),
+  branchesValidator: branches => branches.length <= 3 && branches.length > 0,
+};
+
+module.exports = {maintenance, prerelease, release};
@@ -1,7 +1,9 @@
-const RELEASE_TYPE = ['prerelease', 'prepatch', 'patch', 'preminor', 'minor', 'premajor', 'major'];
+const RELEASE_TYPE = ['patch', 'minor', 'major'];

 const FIRST_RELEASE = '1.0.0';

+const FIRSTPRERELEASE = '1';
+
 const COMMIT_NAME = 'semantic-release-bot';

 const COMMIT_EMAIL = 'semantic-release-bot@martynus.net';
@@ -12,12 +14,16 @@ const SECRET_REPLACEMENT = '[secure]';

 const SECRET_MIN_SIZE = 5;

+const TAG_MESSAGE_FORMAT = `release \${version}`;
+
 module.exports = {
  RELEASE_TYPE,
  FIRST_RELEASE,
+  FIRSTPRERELEASE,
  COMMIT_NAME,
  COMMIT_EMAIL,
  RELEASE_NOTES_SEPARATOR,
  SECRET_REPLACEMENT,
  SECRET_MIN_SIZE,
+  TAG_MESSAGE_FORMAT,
 };
@@ -1,11 +1,13 @@
 const {inspect} = require('util');
-const {toLower, isString} = require('lodash');
+const {toLower, isString, trim} = require('lodash');
 const pkg = require('../../package.json');
 const {RELEASE_TYPE} = require('./constants');

 const [homepage] = pkg.homepage.split('#');
 const stringify = obj => (isString(obj) ? obj : inspect(obj, {breakLength: Infinity, depth: 2, maxArrayLength: 5}));
 const linkify = file => `${homepage}/blob/master/${file}`;
+const wordsList = words =>
+  `${words.slice(0, -1).join(', ')}${words.length > 1 ? ` or ${words[words.length - 1]}` : trim(words[0])}`;

 module.exports = {
  ENOGITREPO: ({cwd}) => ({
@@ -26,11 +28,9 @@ Please make sure to add the \`repositoryUrl\` to the [semantic-release configura
      'docs/usage/configuration.md'
    )}).`,
  }),
-  EGITNOPERMISSION: ({options}) => ({
+  EGITNOPERMISSION: ({options: {repositoryUrl}, branch: {name}}) => ({
    message: 'The push permission to the Git repository is required.',
-    details: `**semantic-release** cannot push the version tag to the branch \`${
-      options.branch
-    }\` on remote Git repository with URL \`${options.repositoryUrl}\`.
+    details: `**semantic-release** cannot push the version tag to the branch \`${name}\` on remote Git repository with URL \`${repositoryUrl}\`.

 Please refer to the [authentication configuration documentation](${linkify(
      'docs/usage/ci-configuration.md#authentication'
@@ -38,7 +38,7 @@ Please refer to the [authentication configuration documentation](${linkify(
      'docs/usage/configuration.md#repositoryurl'
    )}) is configured with a [valid Git URL](https://git-scm.com/book/en/v2/Git-on-the-Server-The-Protocols).`,
  }),
-  EINVALIDTAGFORMAT: ({tagFormat}) => ({
+  EINVALIDTAGFORMAT: ({options: {tagFormat}}) => ({
    message: 'Invalid `tagFormat` option.',
    details: `The [tagFormat](${linkify(
      'docs/usage/configuration.md#tagformat'
@@ -46,7 +46,7 @@ Please refer to the [authentication configuration documentation](${linkify(

 Your configuration for the \`tagFormat\` option is \`${stringify(tagFormat)}\`.`,
  }),
-  ETAGNOVERSION: ({tagFormat}) => ({
+  ETAGNOVERSION: ({options: {tagFormat}}) => ({
    message: 'Invalid `tagFormat` option.',
    details: `The [tagFormat](${linkify(
      'docs/usage/configuration.md#tagformat'
@@ -124,4 +124,107 @@ We recommend to report the issue to the \`${pluginName}\` authors, providing the
      'docs/developer-guide/plugin.md'
    )})`,
  }),
+  EADDCHANNELOUTPUT: ({result, pluginName}) => ({
+    message: 'A `addChannel` plugin returned an invalid value. It must return an `Object`.',
+    details: `The \`addChannel\` plugins must return an \`Object\`.
+
+The \`addChannel\` function of the \`${pluginName}\` returned \`${stringify(result)}\` instead.
+
+We recommend to report the issue to the \`${pluginName}\` authors, providing the following informations:
+- The **semantic-release** version: \`${pkg.version}\`
+- The **semantic-release** logs from your CI job
+- The value returned by the plugin: \`${stringify(result)}\`
+- A link to the **semantic-release** plugin developer guide: [${linkify('docs/developer-guide/plugin.md')}](${linkify(
+      'docs/developer-guide/plugin.md'
+    )})`,
+  }),
+  EINVALIDBRANCH: ({branch}) => ({
+    message: 'A branch is invalid in the `branches` configuration.',
+    details: `Each branch in the [branches configuration](${linkify(
+      'docs/usage/configuration.md#branches'
+    )}) must be either a string, a regexp or an object with a \`name\` property.
+
+Your configuration for the problematic branch is \`${stringify(branch)}\`.`,
+  }),
+  EINVALIDBRANCHNAME: ({branch}) => ({
+    message: 'A branch name is invalid in the `branches` configuration.',
+    details: `Each branch in the [branches configuration](${linkify(
+      'docs/usage/configuration.md#branches'
+    )}) must be a [valid Git reference](https://git-scm.com/docs/git-check-ref-format#_description).
+
+Your configuration for the problematic branch is \`${stringify(branch)}\`.`,
+  }),
+  EDUPLICATEBRANCHES: ({duplicates}) => ({
+    message: 'The `branches` configuration has duplicate branches.',
+    details: `Each branch in the [branches configuration](${linkify(
+      'docs/usage/configuration.md#branches'
+    )}) must havea unique name.
+
+Your configuration contains duplicates for the following branch names: \`${stringify(duplicates)}\`.`,
+  }),
+  EMAINTENANCEBRANCH: ({branch}) => ({
+    message: 'A maintenance branch is invalid in the `branches` configuration.',
+    details: `Each maintenance branch in the [branches configuration](${linkify(
+      'docs/usage/configuration.md#branches'
+    )}) must have a \`range\` property formatted like \`N.x\`, \`N.x.x\` or \`N.N.x\` (\`N\` is a number).
+
+Your configuration for the problematic branch is \`${stringify(branch)}\`.`,
+  }),
+  EMAINTENANCEBRANCHES: ({branches}) => ({
+    message: 'The maintenance branches are invalid in the `branches` configuration.',
+    details: `Each maintenance branch in the [branches configuration](${linkify(
+      'docs/usage/configuration.md#branches'
+    )}) must have a unique \`range\` property.
+
+Your configuration for the problematic branches is \`${stringify(branches)}\`.`,
+  }),
+  ERELEASEBRANCHES: ({branches}) => ({
+    message: 'The release branches are invalid in the `branches` configuration.',
+    details: `A minimum of 1 and a maximum of 3 release branches are required in the [branches configuration](${linkify(
+      'docs/usage/configuration.md#branches'
+    )}).
+    
+This may occur if your repository does not have a release branch, such as \`master\`.
+
+Your configuration for the problematic branches is \`${stringify(branches)}\`.`,
+  }),
+  EPRERELEASEBRANCH: ({branch}) => ({
+    message: 'A pre-release branch configuration is invalid in the `branches` configuration.',
+    details: `Each pre-release branch in the [branches configuration](${linkify(
+      'docs/usage/configuration.md#branches'
+    )}) must have a \`prerelease\` property valid per the [Semantic Versioning Specification](https://semver.org/#spec-item-9). If the \`prerelease\` property is set to \`true\`, then the \`name\` property is used instead.
+
+Your configuration for the problematic branch is \`${stringify(branch)}\`.`,
+  }),
+  EPRERELEASEBRANCHES: ({branches}) => ({
+    message: 'The pre-release branches are invalid in the `branches` configuration.',
+    details: `Each pre-release branch in the [branches configuration](${linkify(
+      'docs/usage/configuration.md#branches'
+    )}) must have a unique \`prerelease\` property. If the \`prerelease\` property is set to \`true\`, then the \`name\` property is used instead.
+
+Your configuration for the problematic branches is \`${stringify(branches)}\`.`,
+  }),
+  EINVALIDNEXTVERSION: ({nextRelease: {version}, branch: {name, range}, commits, validBranches}) => ({
+    message: `The release \`${version}\` on branch \`${name}\` cannot be published as it is out of range.`,
+    details: `Based on the releases published on other branches, only versions within the range \`${range}\` can be published from branch \`${name}\`.
+
+The following commit${commits.length > 1 ? 's are' : ' is'} responsible for the invalid release:
+${commits.map(({commit: {short}, subject}) => `- ${subject} (${short})`).join('\n')}
+
+${
+  commits.length > 1 ? 'Those commits' : 'This commit'
+} should be moved to a valid branch with [git merge](https://git-scm.com/docs/git-merge) or [git cherry-pick](https://git-scm.com/docs/git-cherry-pick) and removed from branch \`${name}\` with [git revert](https://git-scm.com/docs/git-revert) or [git reset](https://git-scm.com/docs/git-reset).
+
+A valid branch could be ${wordsList(validBranches.map(({name}) => `\`${name}\``))}.
+
+See the [workflow configuration documentation](${linkify('docs/usage/workflow-configuration.md')}) for more details.`,
+  }),
+  EINVALIDMAINTENANCEMERGE: ({nextRelease: {channel, gitTag, version}, branch: {mergeRange, name}}) => ({
+    message: `The release \`${version}\` on branch \`${name}\` cannot be published as it is out of range.`,
+    details: `Only releases within the range \`${mergeRange}\` can be merged into the maintenance branch \`${name}\` and published to the \`${channel}\` distribution channel.
+
+The branch \`${name}\` head should be [reset](https://git-scm.com/docs/git-reset) to a previous commit so the commit with tag \`${gitTag}\` is removed from the branch history.
+
+See the [workflow configuration documentation](${linkify('docs/usage/workflow-configuration.md')}) for more details.`,
+  }),
 };
@@ -78,6 +78,19 @@ module.exports = {
      }),
    }),
  },
+  addChannel: {
+    required: false,
+    dryRun: false,
+    outputValidator: output => !output || isPlainObject(output),
+    pipelineConfig: () => ({
+      // Add `nextRelease` and plugin properties to published release
+      transform: (release, step, {nextRelease}) => ({
+        ...(release === false ? {} : nextRelease),
+        ...release,
+        ...step,
+      }),
+    }),
+  },
  success: {
    required: false,
    dryRun: false,
@@ -1,6 +1,5 @@
-const gitLogParser = require('git-log-parser');
-const getStream = require('get-stream');
 const debug = require('debug')('semantic-release:get-commits');
+const {getCommits} = require('./git');

 /**
 * Retrieve the list of commits on the current branch since the commit sha associated with the last release, or all the commits of the current branch if there is no last released version.
@@ -9,21 +8,15 @@ const debug = require('debug')('semantic-release:get-commits');
 *
 * @return {Promise<Array<Object>>} The list of commits on the branch `branch` since the last release.
 */
-module.exports = async ({cwd, env, lastRelease: {gitHead}, logger}) => {
-  if (gitHead) {
-    debug('Use gitHead: %s', gitHead);
+module.exports = async ({cwd, env, lastRelease: {gitHead: from}, nextRelease: {gitHead: to = 'HEAD'} = {}, logger}) => {
+  if (from) {
+    debug('Use from: %s', from);
  } else {
    logger.log('No previous release found, retrieving all commits');
  }

-  Object.assign(gitLogParser.fields, {hash: 'H', message: 'B', gitTags: 'd', committerDate: {key: 'ci', type: Date}});
-  const commits = (await getStream.array(
-    gitLogParser.parse({_: `${gitHead ? gitHead + '..' : ''}HEAD`}, {cwd, env: {...process.env, ...env}})
-  )).map(commit => {
-    commit.message = commit.message.trim();
-    commit.gitTags = commit.gitTags.trim();
-    return commit;
-  });
+  const commits = await getCommits(from, to, {cwd, env});
+
  logger.log(`Found ${commits.length} commits since last release`);
  debug('Parsed commits: %o', commits);
  return commits;
@@ -66,7 +66,14 @@ module.exports = async (context, opts) => {

  // Set default options values if not defined yet
  options = {
-    branch: 'master',
+    branches: [
+      '+([0-9])?(.{+([0-9]),x}).x',
+      'master',
+      'next',
+      'next-major',
+      {name: 'beta', prerelease: true},
+      {name: 'alpha', prerelease: true},
+    ],
    repositoryUrl: (await pkgRepoUrl({normalize: false, cwd})) || (await repoUrl({cwd, env})),
    tagFormat: `v\${version}`,
    plugins: [
@@ -77,6 +84,7 @@ module.exports = async (context, opts) => {
    ],
    // Remove `null` and `undefined` options so they can be replaced with default ones
    ...pickBy(options, option => !isNil(option)),
+    ...(options.branches ? {branches: castArray(options.branches)} : {}),
  };

  debug('options values: %O', options);
@@ -85,6 +93,6 @@ module.exports = async (context, opts) => {
 };

 async function pkgRepoUrl(opts) {
-  const {package: pkg} = (await readPkgUp(opts)) || {};
+  const {pkg} = await readPkgUp(opts);
  return pkg && (isPlainObject(pkg.repository) ? pkg.repository.url : pkg.repository);
 }
@@ -14,7 +14,7 @@ const {verifyAuth} = require('./git');
 *
 * @return {String} The formatted Git repository URL.
 */
-module.exports = async ({cwd, env, options: {repositoryUrl, branch}}) => {
+module.exports = async ({cwd, env, branch, options: {repositoryUrl}}) => {
  const GIT_TOKENS = {
    GIT_CREDENTIALS: undefined,
    GH_TOKEN: undefined,
@@ -40,18 +40,11 @@ module.exports = async ({cwd, env, options: {repositoryUrl, branch}}) => {

  // Test if push is allowed without transforming the URL (e.g. is ssh keys are set up)
  try {
-    await verifyAuth(repositoryUrl, branch, {cwd, env});
+    await verifyAuth(repositoryUrl, branch.name, {cwd, env});
  } catch (error) {
    const envVar = Object.keys(GIT_TOKENS).find(envVar => !isNil(env[envVar]));
    const gitCredentials = `${GIT_TOKENS[envVar] || ''}${env[envVar] || ''}`;

-    console.log(`-------- envVar -------- `);
-    console.log(envVar);
-    console.log(`-------- GIT_TOKENS[envVar] -------- `);
-    console.log(GIT_TOKENS[envVar]);
-    console.log(`-------- env[envVar].substr(5) -------- `);
-    console.log((env[envVar] || '').substr(5));
-
    if (gitCredentials) {
      // If credentials are set via environment variables, convert the URL to http/https and add basic auth, otherwise return `repositoryUrl` as is
      const [match, auth, host, path] = /^(?!.+:\/\/)(?:(.*)@)?(.*?):(.*)$/.exec(repositoryUrl) || [];
@@ -1,8 +1,6 @@
-const {escapeRegExp, template} = require('lodash');
+const {isUndefined} = require('lodash');
 const semver = require('semver');
-const pLocate = require('p-locate');
-const debug = require('debug')('semantic-release:get-last-release');
-const {getTags, isRefInHistory, getTagHead} = require('./git');
+const {makeTag} = require('./utils');

 /**
 * Last release.
@@ -15,37 +13,25 @@ const {getTags, isRefInHistory, getTagHead} = require('./git');
 /**
 * Determine the Git tag and version of the last tagged release.
 *
- * - Obtain all the tags referencing commits in the current branch history
- * - Filter out the ones that are not valid semantic version or doesn't match the `tagFormat`
+ * - Filter out the branch tags that are not valid semantic version
 * - Sort the versions
 * - Retrive the highest version
 *
 * @param {Object} context semantic-release context.
+ * @param {Object} params Function parameters.
+ * @param {Object} params.before Find only releases with version number lower than this version.
 *
- * @return {Promise<LastRelease>} The last tagged release or `undefined` if none is found.
+ * @return {LastRelease} The last tagged release or empty object if none is found.
 */
-module.exports = async ({cwd, env, options: {tagFormat}, logger}) => {
-  // Generate a regex to parse tags formatted with `tagFormat`
-  // by replacing the `version` variable in the template by `(.+)`.
-  // The `tagFormat` is compiled with space as the `version` as it's an invalid tag character,
-  // so it's guaranteed to not be present in the `tagFormat`.
-  const tagRegexp = `^${escapeRegExp(template(tagFormat)({version: ' '})).replace(' ', '(.+)')}`;
-  const tags = (await getTags({cwd, env}))
-    .map(tag => ({gitTag: tag, version: (tag.match(tagRegexp) || new Array(2))[1]}))
-    .filter(
-      tag => tag.version && semver.valid(semver.clean(tag.version)) && !semver.prerelease(semver.clean(tag.version))
-    )
+module.exports = ({branch, options: {tagFormat}}, {before} = {}) => {
+  const [{version, gitTag, gitHead, channel} = {}] = branch.tags
+    .filter(tag => (branch.type === 'prerelease' && branch.channel === tag.channel) || !semver.prerelease(tag.version))
+    .filter(tag => isUndefined(before) || semver.lt(tag.version, before))
    .sort((a, b) => semver.rcompare(a.version, b.version));

-  debug('found tags: %o', tags);
-
-  const tag = await pLocate(tags, tag => isRefInHistory(tag.gitTag, {cwd, env}), {preserveOrder: true});
-
-  if (tag) {
-    logger.log(`Found git tag ${tag.gitTag} associated with version ${tag.version}`);
-    return {gitHead: await getTagHead(tag.gitTag, {cwd, env}), ...tag};
+  if (gitTag) {
+    return {version, gitTag, gitHead, channel, name: makeTag(tagFormat, version)};
  }

-  logger.log('No git tag version found');
  return {};
 };
@@ -1,13 +1,19 @@
 const semver = require('semver');
-const {FIRST_RELEASE} = require('./definitions/constants');
+const {FIRST_RELEASE, FIRSTPRERELEASE} = require('./definitions/constants');

-module.exports = ({nextRelease: {type}, lastRelease, logger}) => {
+module.exports = ({branch, nextRelease: {type, channel}, lastRelease, logger}) => {
  let version;
  if (lastRelease.version) {
-    version = semver.inc(lastRelease.version, type);
-    logger.log(`The next release version is ${version}`);
+    const {major, minor, patch} = semver.parse(lastRelease.version);
+    version =
+      branch.type === 'prerelease'
+        ? semver.prerelease(lastRelease.version) && lastRelease.channel === channel
+          ? semver.inc(lastRelease.version, 'prerelease')
+          : `${semver.inc(`${major}.${minor}.${patch}`, type)}-${branch.prerelease}.${FIRSTPRERELEASE}`
+        : semver.inc(lastRelease.version, type);
+    logger.log('The next release version is %s', version);
  } else {
-    version = FIRST_RELEASE;
+    version = branch.type === 'prerelease' ? `${FIRST_RELEASE}-${branch.prerelease}.${FIRSTPRERELEASE}` : FIRST_RELEASE;
    logger.log(`There is no previous release, the next release version is ${version}`);
  }

@@ -0,0 +1,71 @@
+const {uniq} = require('lodash');
+const semver = require('semver');
+const semverDiff = require('semver-diff');
+const getLastRelease = require('./get-last-release');
+const {makeTag, getLowerBound} = require('./utils');
+
+/**
+ * Find releases that have been merged from from a higher branch but not added on the channel of the current branch.
+ *
+ * @param {Object} context semantic-release context.
+ *
+ * @return {Array<Object>} Last release and next release to be added on the channel of the current branch.
+ */
+module.exports = context => {
+  const {
+    branch,
+    branches,
+    options: {tagFormat},
+  } = context;
+
+  return (
+    branches
+      // Consider only releases of higher branches
+      .slice(branches.findIndex(({name}) => name === branch.name) + 1)
+      // Exclude prerelease branches
+      .filter(({type}) => type !== 'prerelease')
+      // Find higher branch releases merged to building branch but not released on associated channel
+      .reduce(
+        (releases, higherBranch) => [
+          ...releases,
+          // For all unique release version of the higher branch merged on current branch, excluding lower than start range version for maintenance branches
+          ...uniq(
+            branch.tags.filter(
+              ({channel, version}) =>
+                channel === higherBranch.channel &&
+                channel !== branch.channel &&
+                (branch.type !== 'maintenance' || semver.gte(version, getLowerBound(branch.mergeRange)))
+            )
+          )
+            // Find ones that are not released on the building branch channel
+            .filter(tag =>
+              branch.tags.every(
+                ({version, channel}) =>
+                  version !== tag.version || channel === higherBranch.channel || channel !== branch.channel
+              )
+            )
+            // Sort in ascending order to add the most recent release last
+            .sort((a, b) => semver.compare(a.version, b.version))
+            // Construct the last and next release to add to the building branch channel
+            .map(({version, gitHead, gitTag}) => {
+              const lastRelease = getLastRelease(context, {before: version});
+              const type = lastRelease.version ? semverDiff(lastRelease.version, version) : 'major';
+              const name = makeTag(tagFormat, version);
+              return {
+                lastRelease,
+                currentRelease: {type, version, channel: higherBranch.channel, gitTag, name, gitHead},
+                nextRelease: {
+                  type,
+                  version,
+                  channel: branch.channel,
+                  gitTag: makeTag(tagFormat, version, branch.channel),
+                  name,
+                  gitHead,
+                },
+              };
+            }),
+        ],
+        []
+      )
+  );
+};
@@ -1,5 +1,11 @@
+const {matches, pick, memoize, template} = require('lodash');
+const gitLogParser = require('git-log-parser');
+const getStream = require('get-stream');
 const execa = require('execa');
 const debug = require('debug')('semantic-release:git');
+const {TAG_MESSAGE_FORMAT} = require('./definitions/constants');
+
+Object.assign(gitLogParser.fields, {hash: 'H', message: 'B', gitTags: 'd', committerDate: {key: 'ci', type: Date}});

 /**
 * Get the commit sha for a given tag.
@@ -7,7 +13,7 @@ const debug = require('debug')('semantic-release:git');
 * @param {String} tagName Tag name for which to retrieve the commit sha.
 * @param {Object} [execaOpts] Options to pass to `execa`.
 *
- * @return {string} The commit sha of the tag in parameter or `null`.
+ * @return {String} The commit sha of the tag in parameter or `null`.
 */
 async function getTagHead(tagName, execaOpts) {
  try {
@@ -33,19 +39,69 @@ async function getTags(execaOpts) {
 }

 /**
- * Verify if the `ref` is in the direct history of the current branch.
+ * Retrieve a range of commits.
+ *
+ * @param {String} from to includes all commits made after this sha (does not include this sha).
+ * @param {String} to to includes all commits made before this sha (also include this sha).
+ * @param {Object} [execaOpts] Options to pass to `execa`.
+ * @return {Promise<Array<Object>>} The list of commits between `from` and `to`.
+ */
+async function getCommits(from, to, execaOpts) {
+  return (await getStream.array(
+    gitLogParser.parse(
+      {_: `${from ? from + '..' : ''}${to}`},
+      {cwd: execaOpts.cwd, env: {...process.env, ...execaOpts.env}}
+    )
+  )).map(({message, gitTags, ...commit}) => ({...commit, message: message.trim(), gitTags: gitTags.trim()}));
+}
+
+/**
+ * Get all the repository branches.
+ *
+ * @param {String} repositoryUrl The remote repository URL.
+ * @param {Object} [execaOpts] Options to pass to `execa`.
+ *
+ * @return {Array<String>} List of git branches.
+ * @throws {Error} If the `git` command fails.
+ */
+async function getBranches(repositoryUrl, execaOpts) {
+  return (await execa.stdout('git', ['ls-remote', '--heads', repositoryUrl], execaOpts))
+    .split('\n')
+    .map(branch => branch.match(/^.+refs\/heads\/(.+)$/)[1])
+    .filter(Boolean);
+}
+
+const getBranchCommits = memoize((branch, execaOpts) =>
+  getStream.array(gitLogParser.parse({_: branch}, {cwd: execaOpts.cwd, env: {...process.env, ...execaOpts.env}}))
+);
+
+/**
+ * Verify if the `ref` is in the direct history of a given branch.
 *
 * @param {String} ref The reference to look for.
+ * @param {String} branch The branch for which to check if the `ref` is in history.
+ * @param {Boolean} findRebasedTags Weither consider in history tags associated with a commit that was rebased to another branch (i.e. GitHub Rebase and Merge feature).
 * @param {Object} [execaOpts] Options to pass to `execa`.
 *
 * @return {Boolean} `true` if the reference is in the history of the current branch, falsy otherwise.
 */
-async function isRefInHistory(ref, execaOpts) {
+async function isRefInHistory(ref, branch, findRebasedTags, execaOpts) {
+  if (!(await isRefExists(branch, execaOpts))) {
+    return false;
+  }
+
  try {
-    await execa('git', ['merge-base', '--is-ancestor', ref, 'HEAD'], execaOpts);
+    await execa('git', ['merge-base', '--is-ancestor', ref, branch], execaOpts);
    return true;
  } catch (error) {
    if (error.code === 1) {
+      if (findRebasedTags) {
+        const [tagCommit] = await getStream.array(
+          gitLogParser.parse({_: ref, n: '1'}, {cwd: execaOpts.cwd, env: {...process.env, ...execaOpts.env}})
+        );
+        return (await getBranchCommits(branch, execaOpts)).some(matches(pick(tagCommit, ['message', 'author'])));
+      }
+
      return false;
    }

@@ -54,17 +110,54 @@ async function isRefInHistory(ref, execaOpts) {
  }
 }

+/**
+ * Verify if the `ref` exits
+ *
+ * @param {String} ref The reference to verify.
+ * @param {Object} [execaOpts] Options to pass to `execa`.
+ *
+ * @return {Boolean} `true` if the reference exists, falsy otherwise.
+ */
+async function isRefExists(ref, execaOpts) {
+  try {
+    return (await execa('git', ['rev-parse', '--verify', ref], execaOpts)).code === 0;
+  } catch (error) {
+    debug(error);
+  }
+}
+
 /**
 * Unshallow the git repository if necessary and fetch all the tags.
 *
 * @param {String} repositoryUrl The remote repository URL.
+ * @param {String} branch The repository branch to fetch.
 * @param {Object} [execaOpts] Options to pass to `execa`.
 */
-async function fetch(repositoryUrl, execaOpts) {
+async function fetch(repositoryUrl, branch, execaOpts) {
+  const isLocalExists =
+    (await execa('git', ['rev-parse', '--verify', branch], {...execaOpts, reject: false})).code === 0;
+
  try {
-    await execa('git', ['fetch', '--unshallow', '--tags', repositoryUrl], execaOpts);
+    await execa(
+      'git',
+      [
+        'fetch',
+        '--unshallow',
+        '--tags',
+        ...(isLocalExists ? [repositoryUrl] : [repositoryUrl, `+refs/heads/${branch}:refs/heads/${branch}`]),
+      ],
+      execaOpts
+    );
  } catch (error) {
-    await execa('git', ['fetch', '--tags', repositoryUrl], execaOpts);
+    await execa(
+      'git',
+      [
+        'fetch',
+        '--tags',
+        ...(isLocalExists ? [repositoryUrl] : [repositoryUrl, `+refs/heads/${branch}:refs/heads/${branch}`]),
+      ],
+      execaOpts
+    );
  }
 }

@@ -113,7 +206,7 @@ async function isGitRepo(execaOpts) {
 * Verify the write access authorization to remote repository with push dry-run.
 *
 * @param {String} repositoryUrl The remote repository URL.
- * @param {String} branch The repositoru branch for which to verify write access.
+ * @param {String} branch The repository branch for which to verify write access.
 * @param {Object} [execaOpts] Options to pass to `execa`.
 *
 * @throws {Error} if not authorized to push.
@@ -130,13 +223,17 @@ async function verifyAuth(repositoryUrl, branch, execaOpts) {
 /**
 * Tag the commit head on the local repository.
 *
- * @param {String} tagName The name of the tag.
+ * @param {Object} release The release associated with the tag.
 * @param {Object} [execaOpts] Options to pass to `execa`.
 *
 * @throws {Error} if the tag creation failed.
 */
-async function tag(tagName, execaOpts) {
-  await execa('git', ['tag', tagName], execaOpts);
+async function tag(release, execaOpts) {
+  await execa(
+    'git',
+    ['tag', release.gitTag, release.gitHead, '-a', '-m', template(TAG_MESSAGE_FORMAT)(release)],
+    execaOpts
+  );
 }

 /**
@@ -167,18 +264,35 @@ async function verifyTagName(tagName, execaOpts) {
  }
 }

+/**
+ * Verify a branch name is a valid Git reference.
+ *
+ * @param {String} branch the branch name to verify.
+ * @param {Object} [execaOpts] Options to pass to `execa`.
+ *
+ * @return {Boolean} `true` if valid, falsy otherwise.
+ */
+async function verifyBranchName(branch, execaOpts) {
+  try {
+    return (await execa('git', ['check-ref-format', `refs/heads/${branch}`], execaOpts)).code === 0;
+  } catch (error) {
+    debug(error);
+  }
+}
+
 /**
 * Verify the local branch is up to date with the remote one.
 *
+ * @param {String} repositoryUrl The remote repository URL.
 * @param {String} branch The repository branch for which to verify status.
 * @param {Object} [execaOpts] Options to pass to `execa`.
 *
 * @return {Boolean} `true` is the HEAD of the current local branch is the same as the HEAD of the remote branch, falsy otherwise.
 */
-async function isBranchUpToDate(branch, execaOpts) {
-  const remoteHead = await execa.stdout('git', ['ls-remote', '--heads', 'origin', branch], execaOpts);
+async function isBranchUpToDate(repositoryUrl, branch, execaOpts) {
+  const remoteHead = await execa.stdout('git', ['ls-remote', '--heads', repositoryUrl, branch], execaOpts);
  try {
-    return await isRefInHistory(remoteHead.match(/^(\w+)?/)[1], execaOpts);
+    return await isRefInHistory(remoteHead.match(/^(\w+)?/)[1], branch, false, execaOpts);
  } catch (error) {
    debug(error);
  }
@@ -187,7 +301,10 @@ async function isBranchUpToDate(branch, execaOpts) {
 module.exports = {
  getTagHead,
  getTags,
+  getCommits,
+  getBranches,
  isRefInHistory,
+  isRefExists,
  fetch,
  getGitHead,
  repoUrl,
@@ -197,4 +314,5 @@ module.exports = {
  push,
  verifyTagName,
  isBranchUpToDate,
+  verifyBranchName,
 };
@@ -1,4 +1,5 @@
-const {isFunction} = require('lodash');
+const {isFunction, union, template} = require('lodash');
+const semver = require('semver');
 const hideSensitive = require('./hide-sensitive');

 function extractErrors(err) {
@@ -17,4 +18,72 @@ function hideSensitiveValues(env, objs) {
  });
 }

-module.exports = {extractErrors, hideSensitiveValues};
+function tagsToVersions(tags) {
+  return tags.map(({version}) => version);
+}
+
+function isMajorRange(range) {
+  return /^\d+\.x(?:\.x)?$/i.test(range);
+}
+
+function isMaintenanceRange(range) {
+  return /^\d+\.(?:\d+|x)(?:\.x)?$/i.test(range);
+}
+
+function getUpperBound(range) {
+  return semver.valid(range) ? range : ((semver.validRange(range) || '').match(/<(\d+\.\d+\.\d+)$/) || [])[1];
+}
+
+function getLowerBound(range) {
+  return ((semver.validRange(range) || '').match(/(\d+\.\d+\.\d+)/) || [])[1];
+}
+
+function highest(version1, version2) {
+  return version1 && version2 ? (semver.gt(version1, version2) ? version1 : version2) : version1 || version2;
+}
+
+function lowest(version1, version2) {
+  return version1 && version2 ? (semver.lt(version1, version2) ? version1 : version2) : version1 || version2;
+}
+
+function getLatestVersion(versions, {withPrerelease} = {}) {
+  return versions.filter(version => withPrerelease || !semver.prerelease(version)).sort(semver.rcompare)[0];
+}
+
+function getEarliestVersion(versions, {withPrerelease} = {}) {
+  return versions.filter(version => withPrerelease || !semver.prerelease(version)).sort(semver.compare)[0];
+}
+
+function getFirstVersion(versions, lowerBranches) {
+  const lowerVersion = union(...lowerBranches.map(({tags}) => tagsToVersions(tags))).sort(semver.rcompare);
+  if (lowerVersion[0]) {
+    return versions.sort(semver.compare).find(version => semver.gt(version, lowerVersion[0]));
+  }
+
+  return getEarliestVersion(versions);
+}
+
+function getRange(min, max) {
+  return `>=${min}${max ? ` <${max}` : ''}`;
+}
+
+function makeTag(tagFormat, version, channel) {
+  return template(tagFormat)({version: `${version}${channel ? `@${channel}` : ''}`});
+}
+
+module.exports = {
+  extractErrors,
+  hideSensitiveValues,
+  tagsToVersions,
+  isMajorRange,
+  isMaintenanceRange,
+  getUpperBound,
+  getLowerBound,
+  highest,
+  lowest,
+  getLatestVersion,
+  getEarliestVersion,
+  getFirstVersion,
+  getRange,
+  makeTag,
+};
@@ -1,9 +1,14 @@
-const {template} = require('lodash');
+const {template, isString, isPlainObject} = require('lodash');
 const AggregateError = require('aggregate-error');
 const {isGitRepo, verifyTagName} = require('./git');
 const getError = require('./get-error');

-module.exports = async ({cwd, env, options: {repositoryUrl, tagFormat}}) => {
+module.exports = async context => {
+  const {
+    cwd,
+    env,
+    options: {repositoryUrl, tagFormat, branches},
+  } = context;
  const errors = [];

  if (!(await isGitRepo({cwd, env}))) {
@@ -14,16 +19,24 @@ module.exports = async ({cwd, env, options: {repositoryUrl, tagFormat}}) => {

  // Verify that compiling the `tagFormat` produce a valid Git tag
  if (!(await verifyTagName(template(tagFormat)({version: '0.0.0'})))) {
-    errors.push(getError('EINVALIDTAGFORMAT', {tagFormat}));
+    errors.push(getError('EINVALIDTAGFORMAT', context));
  }

  // Verify the `tagFormat` contains the variable `version` by compiling the `tagFormat` template
  // with a space as the `version` value and verify the result contains the space.
  // The space is used as it's an invalid tag character, so it's guaranteed to no be present in the `tagFormat`.
  if ((template(tagFormat)({version: ' '}).match(/ /g) || []).length !== 1) {
-    errors.push(getError('ETAGNOVERSION', {tagFormat}));
+    errors.push(getError('ETAGNOVERSION', context));
  }

+  branches.forEach(branch => {
+    if (
+      !((isString(branch) && branch.trim()) || (isPlainObject(branch) && isString(branch.name) && branch.name.trim()))
+    ) {
+      errors.push(getError('EINVALIDBRANCH', {branch}));
+    }
+  });
+
  if (errors.length > 0) {
    throw new AggregateError(errors);
  }
@@ -19,53 +19,55 @@
    "Pierre Vanduynslager (https://twitter.com/@pvdlg_)"
  ],
  "dependencies": {
-    "@semantic-release/commit-analyzer": "^6.1.0",
+    "@semantic-release/commit-analyzer": "^7.0.0-beta.1",
    "@semantic-release/error": "^2.2.0",
-    "@semantic-release/github": "^5.1.0",
-    "@semantic-release/npm": "^5.0.5",
+    "@semantic-release/github": "=5.5.0-beta.1",
+    "@semantic-release/npm": "^5.2.0-beta.5",
    "@semantic-release/release-notes-generator": "^7.1.2",
-    "aggregate-error": "^3.0.0",
+    "aggregate-error": "^2.0.0",
    "cosmiconfig": "^5.0.1",
    "debug": "^4.0.0",
    "env-ci": "^3.0.0",
    "execa": "^1.0.0",
-    "figures": "^3.0.0",
+    "figures": "^2.0.0",
    "find-versions": "^3.0.0",
-    "get-stream": "^5.0.0",
+    "get-stream": "^4.0.0",
    "git-log-parser": "^1.2.0",
-    "hook-std": "^2.0.0",
+    "hook-std": "^1.1.0",
    "hosted-git-info": "^2.7.1",
    "lodash": "^4.17.4",
    "marked": "^0.6.0",
    "marked-terminal": "^3.2.0",
-    "p-locate": "^4.0.0",
-    "p-reduce": "^2.0.0",
-    "read-pkg-up": "^6.0.0",
-    "resolve-from": "^5.0.0",
-    "semver": "^6.0.0",
+    "micromatch": "3.1.5",
+    "p-each-series": "^1.0.0",
+    "p-reduce": "^1.0.0",
+    "read-pkg-up": "^4.0.0",
+    "resolve-from": "^4.0.0",
+    "semver": "^5.4.1",
+    "semver-diff": "^2.1.0",
    "signale": "^1.2.1",
-    "yargs": "^13.1.0"
+    "yargs": "^12.0.0"
  },
  "devDependencies": {
-    "ava": "^1.3.1",
+    "ava": "^1.0.1",
    "clear-module": "^3.0.0",
    "codecov": "^3.0.0",
    "commitizen": "^3.0.0",
    "cz-conventional-changelog": "^2.0.0",
    "delay": "^4.0.0",
    "dockerode": "^2.5.2",
-    "file-url": "^3.0.0",
-    "fs-extra": "^8.0.0",
+    "file-url": "^2.0.2",
+    "fs-extra": "^7.0.0",
    "got": "^9.0.0",
    "js-yaml": "^3.10.0",
    "mockserver-client": "^5.1.1",
    "nock": "^10.0.0",
-    "nyc": "^14.0.0",
-    "p-retry": "^4.0.0",
+    "nyc": "^13.1.0",
+    "p-retry": "^3.0.0",
    "proxyquire": "^2.0.0",
-    "sinon": "^7.2.7",
+    "sinon": "^7.1.1",
    "stream-buffers": "^3.0.2",
-    "tempy": "^0.3.0",
+    "tempy": "^0.2.1",
    "xo": "^0.24.0"
  },
  "engines": {
@@ -110,7 +112,7 @@
    "trailingComma": "es5"
  },
  "publishConfig": {
-    "tag": "next"
+    "access": "public"
  },
  "repository": {
    "type": "git",
@@ -0,0 +1,199 @@
+import test from 'ava';
+import {union} from 'lodash';
+import semver from 'semver';
+import proxyquire from 'proxyquire';
+
+const getBranch = (branches, branch) => branches.find(({name}) => name === branch);
+const release = (branches, name, version) => getBranch(branches, name).tags.push({version});
+const merge = (branches, source, target, tag) => {
+  getBranch(branches, target).tags = union(
+    getBranch(branches, source).tags.filter(({version}) => !tag || semver.cmp(version, '<=', tag)),
+    getBranch(branches, target).tags
+  );
+};
+
+test('Enforce ranges with branching release workflow', async t => {
+  const branches = [
+    {name: '1.x', tags: []},
+    {name: '1.0.x', tags: []},
+    {name: 'master', tags: []},
+    {name: 'next', tags: []},
+    {name: 'next-major', tags: []},
+    {name: 'beta', prerelease: true, tags: []},
+    {name: 'alpha', prerelease: true, tags: []},
+  ];
+  const getBranches = proxyquire('../../lib/branches', {'./get-tags': () => branches, './expand': () => []});
+
+  let result = (await getBranches('repositoryUrl', {options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, '1.0.x').range, '>=1.0.0 <1.0.0', 'Cannot release on 1.0.x before a releasing on master');
+  t.is(getBranch(result, '1.x').range, '>=1.1.0 <1.0.0', 'Cannot release on 1.x before a releasing on master');
+  t.is(getBranch(result, 'master').range, '>=1.0.0 <1.1.0', 'Can release only patch on master');
+  t.is(getBranch(result, 'next').range, '>=1.1.0 <2.0.0', 'Can release only minor on next');
+  t.is(getBranch(result, 'next-major').range, '>=2.0.0', 'Can release only major on next-major');
+
+  release(branches, 'master', '1.0.0');
+  result = (await getBranches('repositoryUrl', {options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, '1.0.x').range, '>=1.0.0 <1.0.0', 'Cannot release on 1.0.x before a releasing on master');
+  t.is(getBranch(result, '1.x').range, '>=1.1.0 <1.0.0', 'Cannot release on 1.x before a releasing on master');
+  t.is(getBranch(result, 'master').range, '>=1.0.0 <1.1.0', 'Can release only patch on master');
+
+  release(branches, 'master', '1.0.1');
+  result = (await getBranches('repositoryUrl', {options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, 'master').range, '>=1.0.1 <1.1.0', 'Can release only patch, > than 1.0.1 on master');
+
+  merge(branches, 'master', 'next');
+  merge(branches, 'master', 'next-major');
+  result = (await getBranches('repositoryUrl', {options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, 'master').range, '>=1.0.1 <1.1.0', 'Can release only patch, > than 1.0.1 on master');
+  t.is(getBranch(result, 'next').range, '>=1.1.0 <2.0.0', 'Can release only minor on next');
+  t.is(getBranch(result, 'next-major').range, '>=2.0.0', 'Can release only major on next-major');
+
+  release(branches, 'next', '1.1.0');
+  release(branches, 'next', '1.1.1');
+  result = (await getBranches('repositoryUrl', {options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, 'next').range, '>=1.1.1 <2.0.0', 'Can release only patch or minor, > than 1.1.0 on next');
+
+  release(branches, 'next-major', '2.0.0');
+  release(branches, 'next-major', '2.0.1');
+  result = (await getBranches('repositoryUrl', {options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, 'next-major').range, '>=2.0.1', 'Can release any version, > than 2.0.1 on next-major');
+
+  merge(branches, 'next-major', 'beta');
+  release(branches, 'beta', '3.0.0-beta.1');
+  merge(branches, 'beta', 'alpha');
+  release(branches, 'alpha', '4.0.0-alpha.1');
+  result = (await getBranches('repositoryUrl', {options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, 'next-major').range, '>=2.0.1', 'Can release any version, > than 2.0.1 on next-major');
+
+  merge(branches, 'master', '1.0.x');
+  merge(branches, 'master', '1.x');
+  release(branches, 'master', '1.0.1');
+  result = (await getBranches('repositoryUrl', {options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, 'master').range, '>=1.0.1 <1.1.0', 'Can release only patch, > than 1.0.1 on master');
+  t.is(
+    getBranch(result, '1.0.x').range,
+    '>=1.0.1 <1.0.1',
+    'Cannot release on 1.0.x before >= 1.1.0 is released on master'
+  );
+  t.is(getBranch(result, '1.x').range, '>=1.1.0 <1.0.1', 'Cannot release on 1.x before >= 1.2.0 is released on master');
+
+  release(branches, 'master', '1.0.2');
+  release(branches, 'master', '1.0.3');
+  release(branches, 'master', '1.0.4');
+  result = (await getBranches('repositoryUrl', {options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, 'master').range, '>=1.0.4 <1.1.0', 'Can release only patch, > than 1.0.4 on master');
+  t.is(
+    getBranch(result, '1.0.x').range,
+    '>=1.0.1 <1.0.2',
+    'Cannot release on 1.0.x before >= 1.1.0 is released on master'
+  );
+  t.is(getBranch(result, '1.x').range, '>=1.1.0 <1.0.2', 'Cannot release on 1.x before >= 1.2.0 is released on master');
+
+  merge(branches, 'next', 'master');
+  result = (await getBranches('repositoryUrl', {options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, 'master').range, '>=1.1.1 <1.2.0', 'Can release only patch, > than 1.1.1 on master');
+  t.is(getBranch(result, 'next').range, '>=1.2.0 <2.0.0', 'Can release only patch or minor, > than 1.2.0 on next');
+  t.is(getBranch(result, 'next-major').range, '>=2.0.1', 'Can release any version, > than 2.0.1 on next-major');
+  t.is(
+    getBranch(result, '1.0.x').range,
+    '>=1.0.1 <1.0.2',
+    'Cannot release on 1.0.x before 1.0.x version from master are merged'
+  );
+  t.is(getBranch(result, '1.x').range, '>=1.1.0 <1.0.2', 'Cannot release on 1.x before >= 2.0.0 is released on master');
+
+  merge(branches, 'master', '1.0.x', '1.0.4');
+  result = (await getBranches('repositoryUrl', {options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, 'master').range, '>=1.1.1 <1.2.0', 'Can release only patch, > than 1.1.1 on master');
+  t.is(getBranch(result, '1.0.x').range, '>=1.0.4 <1.1.0', 'Can release on 1.0.x only within range');
+  t.is(getBranch(result, '1.x').range, '>=1.1.0 <1.1.0', 'Cannot release on 1.x before >= 2.0.0 is released on master');
+
+  merge(branches, 'master', '1.x');
+  result = (await getBranches('repositoryUrl', {options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, 'master').range, '>=1.1.1 <1.2.0', 'Can release only patch, > than 1.1.1 on master');
+  t.is(getBranch(result, '1.0.x').range, '>=1.0.4 <1.1.0', 'Can release on 1.0.x only within range');
+  t.is(getBranch(result, '1.x').range, '>=1.1.1 <1.1.1', 'Cannot release on 1.x before >= 2.0.0 is released on master');
+
+  merge(branches, 'next-major', 'next');
+  merge(branches, 'next', 'master');
+  result = (await getBranches('repositoryUrl', {options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, 'master').range, '>=2.0.1 <2.1.0', 'Can release only patch, > than 2.0.1 on master');
+  t.is(getBranch(result, 'next').range, '>=2.1.0 <3.0.0', 'Can release only minor on next');
+  t.is(getBranch(result, 'next-major').range, '>=3.0.0', 'Can release only major on next-major');
+  t.is(getBranch(result, '1.x').range, '>=1.1.1 <2.0.0', 'Can release on 1.x only within range');
+
+  merge(branches, 'beta', 'master');
+  result = (await getBranches('repositoryUrl', {options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, 'master').range, '>=2.0.1 <2.1.0', 'Can release only patch, > than 2.0.1 on master');
+  t.is(getBranch(result, 'next').range, '>=2.1.0 <3.0.0', 'Can release only minor on next');
+  t.is(getBranch(result, 'next-major').range, '>=3.0.0', 'Can release only major on next-major');
+
+  branches.push({name: '1.1.x', tags: []});
+  merge(branches, '1.x', '1.1.x');
+  result = (await getBranches('repositoryUrl', {options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, '1.0.x').range, '>=1.0.4 <1.1.0', 'Can release on 1.0.x only within range');
+  t.is(getBranch(result, '1.1.x').range, '>=1.1.1 <1.2.0', 'Can release on 1.1.x only within range');
+  t.is(getBranch(result, '1.x').range, '>=1.2.0 <2.0.0', 'Can release on 1.x only within range');
+});
+
+test('Throw SemanticReleaseError for invalid configurations', async t => {
+  const branches = [
+    {name: '123', range: '123', tags: []},
+    {name: '1.x', tags: []},
+    {name: 'maintenance-1', range: '1.x', tags: []},
+    {name: '1.x.x', tags: []},
+    {name: 'beta', prerelease: '', tags: []},
+    {name: 'alpha', prerelease: 'alpha', tags: []},
+    {name: 'preview', prerelease: 'alpha', tags: []},
+  ];
+  const getBranches = proxyquire('../../lib/branches', {'./get-tags': () => branches, './expand': () => []});
+  const errors = [...(await t.throwsAsync(getBranches('repositoryUrl', {options: {branches}})))];
+
+  t.is(errors[0].name, 'SemanticReleaseError');
+  t.is(errors[0].code, 'EMAINTENANCEBRANCH');
+  t.truthy(errors[0].message);
+  t.truthy(errors[0].details);
+  t.is(errors[1].name, 'SemanticReleaseError');
+  t.is(errors[1].code, 'EMAINTENANCEBRANCHES');
+  t.truthy(errors[1].message);
+  t.truthy(errors[1].details);
+  t.is(errors[2].name, 'SemanticReleaseError');
+  t.is(errors[2].code, 'EPRERELEASEBRANCH');
+  t.truthy(errors[2].message);
+  t.truthy(errors[2].details);
+  t.is(errors[3].name, 'SemanticReleaseError');
+  t.is(errors[3].code, 'EPRERELEASEBRANCHES');
+  t.truthy(errors[3].message);
+  t.truthy(errors[3].details);
+  t.is(errors[4].name, 'SemanticReleaseError');
+  t.is(errors[4].code, 'ERELEASEBRANCHES');
+  t.truthy(errors[4].message);
+  t.truthy(errors[4].details);
+});
+
+test('Throw a SemanticReleaseError if there is duplicate branches', async t => {
+  const branches = [{name: 'master', tags: []}, {name: 'master', tags: []}];
+  const getBranches = proxyquire('../../lib/branches', {'./get-tags': () => branches, './expand': () => []});
+
+  const errors = [...(await t.throwsAsync(getBranches('repositoryUrl', {options: {branches}})))];
+
+  t.is(errors[0].name, 'SemanticReleaseError');
+  t.is(errors[0].code, 'EDUPLICATEBRANCHES');
+  t.truthy(errors[0].message);
+  t.truthy(errors[0].details);
+});
+
+test('Throw a SemanticReleaseError for each invalid branch name', async t => {
+  const branches = [{name: '~master', tags: []}, {name: '^master', tags: []}];
+  const getBranches = proxyquire('../../lib/branches', {'./get-tags': () => branches, './expand': () => []});
+
+  const errors = [...(await t.throwsAsync(getBranches('repositoryUrl', {options: {branches}})))];
+
+  t.is(errors[0].name, 'SemanticReleaseError');
+  t.is(errors[0].code, 'EINVALIDBRANCHNAME');
+  t.truthy(errors[0].message);
+  t.truthy(errors[0].details);
+  t.is(errors[1].name, 'SemanticReleaseError');
+  t.is(errors[1].code, 'EINVALIDBRANCHNAME');
+  t.truthy(errors[1].message);
+  t.truthy(errors[1].details);
+});
@@ -0,0 +1,54 @@
+import test from 'ava';
+import expand from '../../lib/branches/expand';
+import {gitRepo, gitCommits, gitCheckout, gitPush} from '../helpers/git-utils';
+
+test('Expand branches defined with globs', async t => {
+  const {cwd, repositoryUrl} = await gitRepo(true);
+  await gitCommits(['First'], {cwd});
+  await gitPush(repositoryUrl, 'master', {cwd});
+  await gitCheckout('1.0.x', true, {cwd});
+  await gitCommits(['Second'], {cwd});
+  await gitPush(repositoryUrl, '1.0.x', {cwd});
+  await gitCheckout('1.x.x', true, {cwd});
+  await gitCommits(['Third'], {cwd});
+  await gitPush(repositoryUrl, '1.x.x', {cwd});
+  await gitCheckout('2.x', true, {cwd});
+  await gitCommits(['Fourth'], {cwd});
+  await gitPush(repositoryUrl, '2.x', {cwd});
+  await gitCheckout('next', true, {cwd});
+  await gitCommits(['Fifth'], {cwd});
+  await gitPush(repositoryUrl, 'next', {cwd});
+  await gitCheckout('pre/foo', true, {cwd});
+  await gitCommits(['Sixth'], {cwd});
+  await gitPush(repositoryUrl, 'pre/foo', {cwd});
+  await gitCheckout('pre/bar', true, {cwd});
+  await gitCommits(['Seventh'], {cwd});
+  await gitPush(repositoryUrl, 'pre/bar', {cwd});
+  await gitCheckout('beta', true, {cwd});
+  await gitCommits(['Eighth'], {cwd});
+  await gitPush(repositoryUrl, 'beta', {cwd});
+
+  const branches = [
+    // Should match all maintenance type branches
+    {name: '+([0-9])?(.{+([0-9]),x}).x'},
+    {name: 'master', channel: 'latest'},
+    {name: 'next'},
+    {name: 'pre/{foo,bar}', channel: `\${name.replace(/^pre\\//g, '')}`, prerelease: true},
+    // Should be ignored as there is no matching branches in the repo
+    {name: 'missing'},
+    // Should be ignored as the matching branch in the repo is already matched by `/^pre\\/(\\w+)$/gi`
+    {name: '*/foo', channel: 'foo', prerelease: 'foo'},
+    {name: 'beta', channel: `channel-\${name}`, prerelease: true},
+  ];
+
+  t.deepEqual(await expand(repositoryUrl, {cwd}, branches), [
+    {name: '1.0.x'},
+    {name: '1.x.x'},
+    {name: '2.x'},
+    {name: 'master', channel: 'latest'},
+    {name: 'next'},
+    {name: 'pre/bar', channel: 'bar', prerelease: true},
+    {name: 'pre/foo', channel: 'foo', prerelease: true},
+    {name: 'beta', channel: 'channel-beta', prerelease: true},
+  ]);
+});
@@ -0,0 +1,202 @@
+import test from 'ava';
+import getTags from '../../lib/branches/get-tags';
+import {gitRepo, gitCommits, gitTagVersion, gitCheckout, merge, changeAuthor} from '../helpers/git-utils';
+
+test('Get the valid tags', async t => {
+  const {cwd} = await gitRepo();
+  const commits = await gitCommits(['First'], {cwd});
+  await gitTagVersion('foo', undefined, {cwd});
+  await gitTagVersion('v2.0.0', undefined, {cwd});
+  commits.push(...(await gitCommits(['Second'], {cwd})));
+  await gitTagVersion('v1.0.0', undefined, {cwd});
+  commits.push(...(await gitCommits(['Third'], {cwd})));
+  await gitTagVersion('v3.0', undefined, {cwd});
+  commits.push(...(await gitCommits(['Fourth'], {cwd})));
+  await gitTagVersion('v3.0.0-beta.1', undefined, {cwd});
+
+  const result = await getTags({cwd, options: {tagFormat: `v\${version}`}}, [{name: 'master'}]);
+
+  t.deepEqual(result, [
+    {
+      name: 'master',
+      tags: [
+        {gitTag: 'v1.0.0', version: '1.0.0', channel: undefined, gitHead: commits[1].hash},
+        {gitTag: 'v2.0.0', version: '2.0.0', channel: undefined, gitHead: commits[0].hash},
+        {gitTag: 'v3.0.0-beta.1', version: '3.0.0-beta.1', channel: undefined, gitHead: commits[3].hash},
+      ],
+    },
+  ]);
+});
+
+test('Get the valid tags from multiple branches', async t => {
+  const {cwd} = await gitRepo();
+  const commits = await gitCommits(['First'], {cwd});
+  await gitTagVersion('v1.0.0', undefined, {cwd});
+  await gitTagVersion('v1.0.0@1.x', undefined, {cwd});
+  commits.push(...(await gitCommits(['Second'], {cwd})));
+  await gitTagVersion('v1.1.0', undefined, {cwd});
+  await gitTagVersion('v1.1.0@1.x', undefined, {cwd});
+  await gitCheckout('1.x', true, {cwd});
+  await gitCheckout('master', false, {cwd});
+  commits.push(...(await gitCommits(['Third'], {cwd})));
+  await gitTagVersion('v2.0.0', undefined, {cwd});
+  await gitTagVersion('v2.0.0@next', undefined, {cwd});
+  await gitCheckout('next', true, {cwd});
+  commits.push(...(await gitCommits(['Fourth'], {cwd})));
+  await gitTagVersion('v3.0.0@next', undefined, {cwd});
+
+  const result = await getTags({cwd, options: {tagFormat: `v\${version}`}}, [
+    {name: '1.x'},
+    {name: 'master'},
+    {name: 'next'},
+  ]);
+
+  t.deepEqual(result, [
+    {
+      name: '1.x',
+      tags: [
+        {gitTag: 'v1.0.0', version: '1.0.0', channel: undefined, gitHead: commits[0].hash},
+        {gitTag: 'v1.0.0@1.x', version: '1.0.0', channel: '1.x', gitHead: commits[0].hash},
+        {gitTag: 'v1.1.0', version: '1.1.0', channel: undefined, gitHead: commits[1].hash},
+        {gitTag: 'v1.1.0@1.x', version: '1.1.0', channel: '1.x', gitHead: commits[1].hash},
+      ],
+    },
+    {
+      name: 'master',
+      tags: [
+        ...result[0].tags,
+        {gitTag: 'v2.0.0', version: '2.0.0', channel: undefined, gitHead: commits[2].hash},
+        {gitTag: 'v2.0.0@next', version: '2.0.0', channel: 'next', gitHead: commits[2].hash},
+      ],
+    },
+    {
+      name: 'next',
+      tags: [...result[1].tags, {gitTag: 'v3.0.0@next', version: '3.0.0', channel: 'next', gitHead: commits[3].hash}],
+    },
+  ]);
+});
+
+test('Match the tag name from the begining of the string and the channel from the last "@"', async t => {
+  const {cwd} = await gitRepo();
+  const commits = await gitCommits(['First'], {cwd});
+  await gitTagVersion('prefix@v1.0.0', undefined, {cwd});
+  await gitTagVersion('prefix@v1.0.0@next', undefined, {cwd});
+  await gitTagVersion('prefix@v2.0.0', undefined, {cwd});
+  await gitTagVersion('prefix@v2.0.0@next', undefined, {cwd});
+  await gitTagVersion('other-prefix@v3.0.0', undefined, {cwd});
+
+  const result = await getTags({cwd, options: {tagFormat: `prefix@v\${version}`}}, [{name: 'master'}]);
+
+  t.deepEqual(result, [
+    {
+      name: 'master',
+      tags: [
+        {gitTag: 'prefix@v1.0.0', version: '1.0.0', channel: undefined, gitHead: commits[0].hash},
+        {gitTag: 'prefix@v1.0.0@next', version: '1.0.0', channel: 'next', gitHead: commits[0].hash},
+        {gitTag: 'prefix@v2.0.0', version: '2.0.0', channel: undefined, gitHead: commits[0].hash},
+        {gitTag: 'prefix@v2.0.0@next', version: '2.0.0', channel: 'next', gitHead: commits[0].hash},
+      ],
+    },
+  ]);
+});
+
+test('Return branches with and empty tags array if no valid tag is found', async t => {
+  const {cwd} = await gitRepo();
+  await gitCommits(['First'], {cwd});
+  await gitTagVersion('foo', undefined, {cwd});
+  await gitCommits(['Second'], {cwd});
+  await gitTagVersion('v2.0.x', undefined, {cwd});
+  await gitCommits(['Third'], {cwd});
+  await gitTagVersion('v3.0', undefined, {cwd});
+
+  const result = await getTags({cwd, options: {tagFormat: `prefix@v\${version}`}}, [{name: 'master'}, {name: 'next'}]);
+
+  t.deepEqual(result, [{name: 'master', tags: []}, {name: 'next', tags: []}]);
+});
+
+test('Return branches with and empty tags array if no valid tag is found in history of configured branches', async t => {
+  const {cwd} = await gitRepo();
+  await gitCommits(['First'], {cwd});
+  await gitCheckout('other-branch', true, {cwd});
+  await gitCommits(['Second'], {cwd});
+  await gitTagVersion('v1.0.0', undefined, {cwd});
+  await gitTagVersion('v1.0.0@next', undefined, {cwd});
+  await gitTagVersion('v2.0.0', undefined, {cwd});
+  await gitTagVersion('v2.0.0@next', undefined, {cwd});
+  await gitTagVersion('v3.0.0', undefined, {cwd});
+  await gitTagVersion('v3.0.0@next', undefined, {cwd});
+  await gitCheckout('master', false, {cwd});
+
+  const result = await getTags({cwd, options: {tagFormat: `prefix@v\${version}`}}, [{name: 'master'}, {name: 'next'}]);
+
+  t.deepEqual(result, [{name: 'master', tags: []}, {name: 'next', tags: []}]);
+});
+
+test('Get the highest valid tag corresponding to the "tagFormat"', async t => {
+  const {cwd} = await gitRepo();
+  const commits = await gitCommits(['First'], {cwd});
+
+  await gitTagVersion('1.0.0', undefined, {cwd});
+  t.deepEqual(await getTags({cwd, options: {tagFormat: `\${version}`}}, [{name: 'master'}]), [
+    {name: 'master', tags: [{gitTag: '1.0.0', version: '1.0.0', channel: undefined, gitHead: commits[0].hash}]},
+  ]);
+
+  await gitTagVersion('foo-1.0.0-bar', undefined, {cwd});
+  t.deepEqual(await getTags({cwd, options: {tagFormat: `foo-\${version}-bar`}}, [{name: 'master'}]), [
+    {name: 'master', tags: [{gitTag: 'foo-1.0.0-bar', version: '1.0.0', channel: undefined, gitHead: commits[0].hash}]},
+  ]);
+
+  await gitTagVersion('foo-v1.0.0-bar', undefined, {cwd});
+  t.deepEqual(await getTags({cwd, options: {tagFormat: `foo-v\${version}-bar`}}, [{name: 'master'}]), [
+    {
+      name: 'master',
+      tags: [{gitTag: 'foo-v1.0.0-bar', version: '1.0.0', channel: undefined, gitHead: commits[0].hash}],
+    },
+  ]);
+
+  await gitTagVersion('(.+)/1.0.0/(a-z)', undefined, {cwd});
+  t.deepEqual(await getTags({cwd, options: {tagFormat: `(.+)/\${version}/(a-z)`}}, [{name: 'master'}]), [
+    {
+      name: 'master',
+      tags: [{gitTag: '(.+)/1.0.0/(a-z)', version: '1.0.0', channel: undefined, gitHead: commits[0].hash}],
+    },
+  ]);
+
+  await gitTagVersion('2.0.0-1.0.0-bar.1', undefined, {cwd});
+  t.deepEqual(await getTags({cwd, options: {tagFormat: `2.0.0-\${version}-bar.1`}}, [{name: 'master'}]), [
+    {
+      name: 'master',
+      tags: [{gitTag: '2.0.0-1.0.0-bar.1', version: '1.0.0', channel: undefined, gitHead: commits[0].hash}],
+    },
+  ]);
+
+  await gitTagVersion('3.0.0-bar.2', undefined, {cwd});
+  t.deepEqual(await getTags({cwd, options: {tagFormat: `\${version}-bar.2`}}, [{name: 'master'}]), [
+    {name: 'master', tags: [{gitTag: '3.0.0-bar.2', version: '3.0.0', channel: undefined, gitHead: commits[0].hash}]},
+  ]);
+});
+
+test('Get the tag on branch where commits have been rebased', async t => {
+  const {cwd} = await gitRepo();
+  const commits = await gitCommits(['First'], {cwd});
+  await gitCheckout('next', true, {cwd});
+  commits.push(...(await gitCommits(['Second/n/n/commit body'], {cwd})));
+  await gitTagVersion('v1.0.0@next', undefined, {cwd});
+  await gitCheckout('master', false, {cwd});
+  await merge('next', {cwd});
+  // Simulate GitHub "Rebase and Merge" by changing the committer info, which will result in a new commit sha and losing the tag
+  await changeAuthor(commits[1].hash, {cwd});
+
+  const result = await getTags({cwd, options: {tagFormat: `v\${version}`}}, [{name: 'master'}, {name: 'next'}]);
+
+  t.deepEqual(result, [
+    {
+      name: 'master',
+      tags: [{gitTag: 'v1.0.0@next', version: '1.0.0', channel: 'next', gitHead: commits[1].hash}],
+    },
+    {
+      name: 'next',
+      tags: [{gitTag: 'v1.0.0@next', version: '1.0.0', channel: 'next', gitHead: commits[1].hash}],
+    },
+  ]);
+});
@@ -0,0 +1,326 @@
+import test from 'ava';
+import normalize from '../../lib/branches/normalize';
+
+const toTags = versions => versions.map(version => ({version}));
+
+test('Maintenance branches - initial state', t => {
+  const maintenance = [{name: '1.x', channel: '1.x', tags: []}, {name: '1.1.x', tags: []}, {name: '1.2.x', tags: []}];
+  const release = [{name: 'master', tags: []}];
+  t.deepEqual(
+    normalize.maintenance({maintenance, release}).map(({type, name, range, accept, channel, mergeRange}) => ({
+      type,
+      name,
+      range,
+      accept,
+      channel,
+      mergeRange,
+    })),
+    [
+      {
+        type: 'maintenance',
+        name: '1.1.x',
+        range: '>=1.1.0 <1.0.0',
+        accept: [],
+        channel: '1.1.x',
+        mergeRange: '>=1.1.0 <1.2.0',
+      },
+      {
+        type: 'maintenance',
+        name: '1.2.x',
+        range: '>=1.2.0 <1.0.0',
+        accept: [],
+        channel: '1.2.x',
+        mergeRange: '>=1.2.0 <1.3.0',
+      },
+      {
+        type: 'maintenance',
+        name: '1.x',
+        range: '>=1.3.0 <1.0.0',
+        accept: [],
+        channel: '1.x',
+        mergeRange: '>=1.3.0 <2.0.0',
+      },
+    ]
+  );
+});
+
+test('Maintenance branches - cap range to first release present on default branch and not in any Maintenance one', t => {
+  const maintenance = [
+    {name: '1.x', tags: toTags(['1.0.0', '1.1.0', '1.1.1', '1.2.0', '1.2.1', '1.3.0', '1.4.0', '1.5.0'])},
+    {name: 'name', range: '1.1.x', tags: toTags(['1.0.0', '1.0.1', '1.1.0', '1.1.1'])},
+    {name: '1.2.x', tags: toTags(['1.0.0', '1.1.0', '1.1.1', '1.2.0', '1.2.1'])},
+    {name: '2.x.x', tags: toTags(['1.0.0', '1.1.0', '1.1.1', '1.2.0', '1.2.1', '1.5.0'])},
+  ];
+  const release = [
+    {
+      name: 'master',
+      tags: toTags(['1.0.0', '1.1.0', '1.1.1', '1.2.0', '1.2.1', '1.3.0', '1.4.0', '1.5.0', '1.6.0', '2.0.0']),
+    },
+  ];
+
+  t.deepEqual(
+    normalize
+      .maintenance({maintenance, release})
+      .map(({type, name, range, accept, channel, mergeRange: maintenanceRange}) => ({
+        type,
+        name,
+        range,
+        accept,
+        channel,
+        mergeRange: maintenanceRange,
+      })),
+    [
+      {
+        type: 'maintenance',
+        name: 'name',
+        range: '>=1.1.1 <1.2.0',
+        accept: ['patch'],
+        channel: 'name',
+        mergeRange: '>=1.1.0 <1.2.0',
+      },
+      {
+        type: 'maintenance',
+        name: '1.2.x',
+        range: '>=1.2.1 <1.3.0',
+        accept: ['patch'],
+        channel: '1.2.x',
+        mergeRange: '>=1.2.0 <1.3.0',
+      },
+      {
+        type: 'maintenance',
+        name: '1.x',
+        range: '>=1.5.0 <1.6.0',
+        accept: ['patch'],
+        channel: '1.x',
+        mergeRange: '>=1.3.0 <2.0.0',
+      },
+      {
+        type: 'maintenance',
+        name: '2.x.x',
+        range: '>=2.0.0 <1.6.0',
+        accept: [],
+        channel: '2.x.x',
+        mergeRange: '>=2.0.0 <3.0.0',
+      },
+    ]
+  );
+});
+
+test('Maintenance branches - cap range to default branch last release if all release are also present on maintenance branch', t => {
+  const maintenance = [
+    {name: '1.x', tags: toTags(['1.0.0', '1.2.0', '1.3.0'])},
+    {name: '2.x.x', tags: toTags(['1.0.0', '1.2.0', '1.3.0', '2.0.0'])},
+  ];
+  const release = [{name: 'master', tags: toTags(['1.0.0', '1.2.0', '1.3.0', '2.0.0'])}];
+
+  t.deepEqual(
+    normalize.maintenance({maintenance, release}).map(({type, name, range, accept, channel, mergeRange}) => ({
+      type,
+      name,
+      range,
+      accept,
+      channel,
+      mergeRange,
+    })),
+    [
+      {
+        type: 'maintenance',
+        name: '1.x',
+        range: '>=1.3.0 <2.0.0',
+        accept: ['patch', 'minor'],
+        channel: '1.x',
+        mergeRange: '>=1.0.0 <2.0.0',
+      },
+      {
+        type: 'maintenance',
+        name: '2.x.x',
+        range: '>=2.0.0 <2.0.0',
+        accept: [],
+        channel: '2.x.x',
+        mergeRange: '>=2.0.0 <3.0.0',
+      },
+    ]
+  );
+});
+
+test('Release branches - initial state', t => {
+  const release = [
+    {name: 'master', tags: []},
+    {name: 'next', channel: 'next', tags: []},
+    {name: 'next-major', tags: []},
+  ];
+
+  t.deepEqual(
+    normalize.release({release}).map(({type, name, range, accept, channel}) => ({type, name, range, accept, channel})),
+    [
+      {type: 'release', name: 'master', range: '>=1.0.0 <1.1.0', accept: ['patch'], channel: undefined},
+      {type: 'release', name: 'next', range: '>=1.1.0 <2.0.0', accept: ['patch', 'minor'], channel: 'next'},
+      {
+        type: 'release',
+        name: 'next-major',
+        range: '>=2.0.0',
+        accept: ['patch', 'minor', 'major'],
+        channel: 'next-major',
+      },
+    ]
+  );
+});
+
+test('Release branches - 3 release branches', t => {
+  const release = [
+    {name: 'master', tags: toTags(['1.0.0', '1.0.1', '1.0.2'])},
+    {name: 'next', tags: toTags(['1.0.0', '1.0.1', '1.0.2', '1.1.0', '1.2.0'])},
+    {name: 'next-major', tags: toTags(['1.0.0', '1.0.1', '1.0.2', '1.1.0', '1.2.0', '2.0.0', '2.0.1', '2.1.0'])},
+  ];
+
+  t.deepEqual(
+    normalize.release({release}).map(({type, name, range, accept, channel}) => ({type, name, range, accept, channel})),
+    [
+      {type: 'release', name: 'master', range: '>=1.0.2 <1.1.0', accept: ['patch'], channel: undefined},
+      {type: 'release', name: 'next', range: '>=1.2.0 <2.0.0', accept: ['patch', 'minor'], channel: 'next'},
+      {
+        type: 'release',
+        name: 'next-major',
+        range: '>=2.1.0',
+        accept: ['patch', 'minor', 'major'],
+        channel: 'next-major',
+      },
+    ]
+  );
+});
+
+test('Release branches - 2 release branches', t => {
+  const release = [
+    {name: 'master', tags: toTags(['1.0.0', '1.0.1', '1.1.0', '1.1.1', '1.2.0'])},
+    {name: 'next', tags: toTags(['1.0.0', '1.0.1', '1.1.0', '1.1.1', '1.2.0', '2.0.0', '2.0.1', '2.1.0'])},
+  ];
+
+  t.deepEqual(
+    normalize.release({release}).map(({type, name, range, accept, channel}) => ({type, name, range, accept, channel})),
+    [
+      {type: 'release', name: 'master', range: '>=1.2.0 <2.0.0', accept: ['patch', 'minor'], channel: undefined},
+      {type: 'release', name: 'next', range: '>=2.1.0', accept: ['patch', 'minor', 'major'], channel: 'next'},
+    ]
+  );
+});
+
+test('Release branches - 1 release branches', t => {
+  const release = [{name: 'master', tags: toTags(['1.0.0', '1.1.0', '1.1.1', '1.2.0'])}];
+
+  t.deepEqual(
+    normalize.release({release}).map(({type, name, range, accept, channel}) => ({type, name, range, accept, channel})),
+    [{type: 'release', name: 'master', range: '>=1.2.0', accept: ['patch', 'minor', 'major'], channel: undefined}]
+  );
+});
+
+test('Release branches - cap ranges to first release only present on following branch', t => {
+  const release = [
+    {name: 'master', tags: toTags(['1.0.0', '1.1.0', '1.2.0', '2.0.0'])},
+    {name: 'next', tags: toTags(['1.0.0', '1.1.0', '1.2.0', '2.0.0', '2.1.0'])},
+    {name: 'next-major', tags: toTags(['1.0.0', '1.1.0', '1.2.0', '2.0.0', '2.1.0', '2.2.0'])},
+  ];
+
+  t.deepEqual(
+    normalize.release({release}).map(({type, name, range, accept, channel}) => ({type, name, range, accept, channel})),
+    [
+      {type: 'release', name: 'master', range: '>=2.0.0 <2.1.0', accept: ['patch'], channel: undefined},
+      {type: 'release', name: 'next', range: '>=2.1.0 <2.2.0', accept: ['patch'], channel: 'next'},
+      {
+        type: 'release',
+        name: 'next-major',
+        range: '>=2.2.0',
+        accept: ['patch', 'minor', 'major'],
+        channel: 'next-major',
+      },
+    ]
+  );
+});
+
+test('Release branches - Handle missing previous tags in branch history', t => {
+  const release = [
+    {name: 'master', tags: toTags(['1.0.0', '2.0.0'])},
+    {name: 'next', tags: toTags(['1.0.0', '1.1.0', '1.1.1', '1.2.0', '2.0.0'])},
+  ];
+
+  t.deepEqual(
+    normalize.release({release}).map(({type, name, range, accept, channel}) => ({type, name, range, accept, channel})),
+    [
+      {type: 'release', name: 'master', range: '>=2.0.0 <3.0.0', accept: ['patch', 'minor'], channel: undefined},
+      {type: 'release', name: 'next', range: '>=3.0.0', accept: ['patch', 'minor', 'major'], channel: 'next'},
+    ]
+  );
+});
+
+test('Release branches - enforce release gaps after downstream merge', t => {
+  const release = [
+    {name: 'master', tags: toTags(['1.0.0', '1.1.0', '2.0.0'])},
+    {name: 'next', tags: toTags(['1.0.0', '1.1.0', '2.0.0'])},
+    {name: 'next-major', tags: toTags(['1.0.0', '1.1.0', '2.0.0'])},
+  ];
+
+  t.deepEqual(
+    normalize.release({release}).map(({type, name, range, accept, channel}) => ({type, name, range, accept, channel})),
+    [
+      {type: 'release', name: 'master', range: '>=2.0.0 <2.1.0', accept: ['patch'], channel: undefined},
+      {type: 'release', name: 'next', range: '>=2.1.0 <3.0.0', accept: ['patch', 'minor'], channel: 'next'},
+      {
+        type: 'release',
+        name: 'next-major',
+        range: '>=3.0.0',
+        accept: ['patch', 'minor', 'major'],
+        channel: 'next-major',
+      },
+    ]
+  );
+});
+
+test('Release branches - limit releases on 2nd and 3rd branche based on 1st branch last release', t => {
+  const release = [
+    {name: 'master', tags: toTags(['1.0.0', '1.1.0', '2.0.0', '3.0.0'])},
+    {name: 'next', tags: toTags(['1.0.0', '1.1.0'])},
+    {name: 'next-major', tags: toTags(['1.0.0', '1.1.0', '2.0.0'])},
+  ];
+
+  t.deepEqual(
+    normalize.release({release}).map(({type, name, range, accept, channel}) => ({type, name, range, accept, channel})),
+    [
+      {type: 'release', name: 'master', range: '>=3.0.0 <3.1.0', accept: ['patch'], channel: undefined},
+      {type: 'release', name: 'next', range: '>=3.1.0 <4.0.0', accept: ['patch', 'minor'], channel: 'next'},
+      {
+        type: 'release',
+        name: 'next-major',
+        range: '>=4.0.0',
+        accept: ['patch', 'minor', 'major'],
+        channel: 'next-major',
+      },
+    ]
+  );
+});
+
+test('Prerelease branches', t => {
+  const prerelease = [
+    {name: 'beta', channel: 'beta', prerelease: true, tags: []},
+    {name: 'alpha', prerelease: 'preview', tags: []},
+  ];
+
+  t.deepEqual(normalize.prerelease({prerelease}).map(({type, name, channel}) => ({type, name, channel})), [
+    {type: 'prerelease', name: 'beta', channel: 'beta'},
+    {type: 'prerelease', name: 'alpha', channel: 'alpha'},
+  ]);
+});
+
+test('Allow to set channel to "false" to prevent default', t => {
+  const maintenance = [{name: '1.x', channel: false, tags: []}];
+  const release = [{name: 'master', channel: false, tags: []}, {name: 'next', channel: false, tags: []}];
+  const prerelease = [{name: 'beta', channel: false, prerelease: true, tags: []}];
+  t.deepEqual(normalize.maintenance({maintenance, release}).map(({name, channel}) => ({name, channel})), [
+    {name: '1.x', channel: false},
+  ]);
+  t.deepEqual(normalize.release({release}).map(({name, channel}) => ({name, channel})), [
+    {name: 'master', channel: false},
+    {name: 'next', channel: false},
+  ]);
+  t.deepEqual(normalize.prerelease({prerelease}).map(({name, channel}) => ({name, channel})), [
+    {name: 'beta', channel: false},
+  ]);
+});
@@ -29,6 +29,7 @@ test.serial('Pass options to semantic-release API', async t => {
    '',
    '-b',
    'master',
+    'next',
    '-r',
    'https://github/com/owner/repo.git',
    '-t',
@@ -68,7 +69,7 @@ test.serial('Pass options to semantic-release API', async t => {

  const exitCode = await cli();

-  t.is(run.args[0][0].branch, 'master');
+  t.deepEqual(run.args[0][0].branches, ['master', 'next']);
  t.is(run.args[0][0].repositoryUrl, 'https://github/com/owner/repo.git');
  t.is(run.args[0][0].tagFormat, `v\${version}`);
  t.deepEqual(run.args[0][0].plugins, ['plugin1', 'plugin2']);
@@ -92,7 +93,7 @@ test.serial('Pass options to semantic-release API with alias arguments', async t
  const argv = [
    '',
    '',
-    '--branch',
+    '--branches',
    'master',
    '--repository-url',
    'https://github/com/owner/repo.git',
@@ -110,7 +111,7 @@ test.serial('Pass options to semantic-release API with alias arguments', async t

  const exitCode = await cli();

-  t.is(run.args[0][0].branch, 'master');
+  t.deepEqual(run.args[0][0].branches, ['master']);
  t.is(run.args[0][0].repositoryUrl, 'https://github/com/owner/repo.git');
  t.is(run.args[0][0].tagFormat, `v\${version}`);
  t.deepEqual(run.args[0][0].plugins, ['plugin1', 'plugin2']);
@@ -0,0 +1,86 @@
+import test from 'ava';
+import {maintenance, prerelease, release} from '../../lib/definitions/branches';
+
+test('A "maintenance" branch is identified by having a "range" property or a "name" formatted like "N.x", "N.x.x" or "N.N.x"', t => {
+  t.true(maintenance.filter({name: '1.x.x'}));
+  t.true(maintenance.filter({name: '1.0.x'}));
+  t.true(maintenance.filter({name: '1.x'}));
+  t.true(maintenance.filter({name: 'some-name', range: '1.x.x'}));
+  t.true(maintenance.filter({name: 'some-name', range: '1.1.x'}));
+  t.true(maintenance.filter({name: 'some-name', range: ''}));
+  t.true(maintenance.filter({name: 'some-name', range: null}));
+  t.true(maintenance.filter({name: 'some-name', range: false}));
+
+  t.false(maintenance.filter({name: 'some-name'}));
+  t.false(maintenance.filter({name: '1.0.0'}));
+  t.false(maintenance.filter({name: 'x.x.x'}));
+});
+
+test('A "maintenance" branches must have a "range" property formatted like "N.x", "N.x.x" or "N.N.x"', t => {
+  t.true(maintenance.branchValidator({name: 'some-name', range: '1.x.x'}));
+  t.true(maintenance.branchValidator({name: 'some-name', range: '1.1.x'}));
+
+  t.false(maintenance.branchValidator({name: 'some-name', range: '^1.0.0'}));
+  t.false(maintenance.branchValidator({name: 'some-name', range: '>=1.0.0 <2.0.0'}));
+  t.false(maintenance.branchValidator({name: 'some-name', range: '1.0.0'}));
+  t.false(maintenance.branchValidator({name: 'some-name', range: 'wrong-range'}));
+  t.false(maintenance.branchValidator({name: 'some-name', range: ''}));
+  t.false(maintenance.branchValidator({name: 'some-name', range: null}));
+  t.false(maintenance.branchValidator({name: 'some-name', range: false}));
+});
+
+test('The "maintenance" branches must have unique ranges', t => {
+  t.true(maintenance.branchesValidator([{range: '1.x.x'}, {range: '1.0.x'}]));
+
+  t.false(maintenance.branchesValidator([{range: '1.x.x'}, {range: '1.x.x'}]));
+  t.false(maintenance.branchesValidator([{range: '1.x.x'}, {range: '1.x'}]));
+});
+
+test('A "prerelease" branch is identified by having a range "prerelease" property', t => {
+  t.true(prerelease.filter({name: 'some-name', prerelease: true}));
+  t.true(prerelease.filter({name: 'some-name', prerelease: 'beta'}));
+  t.true(prerelease.filter({name: 'some-name', prerelease: ''}));
+  t.true(prerelease.filter({name: 'some-name', prerelease: null}));
+  t.true(prerelease.filter({name: 'some-name', prerelease: false}));
+
+  t.false(prerelease.filter({name: 'some-name'}));
+});
+
+test('A "prerelease" branch must have a valid prerelease detonation in "prerelease" property or in "name" if "prerelease" is "true"', t => {
+  t.true(prerelease.branchValidator({name: 'beta', prerelease: true}));
+  t.true(prerelease.branchValidator({name: 'some-name', prerelease: 'beta'}));
+
+  t.false(prerelease.branchValidator({name: 'some-name', prerelease: ''}));
+  t.false(prerelease.branchValidator({name: 'some-name', prerelease: null}));
+  t.false(prerelease.branchValidator({name: 'some-name', prerelease: false}));
+  t.false(prerelease.branchValidator({name: 'some-name', prerelease: '000'}));
+  t.false(prerelease.branchValidator({name: 'some-name', prerelease: '#beta'}));
+  t.false(prerelease.branchValidator({name: '000', prerelease: true}));
+  t.false(prerelease.branchValidator({name: '#beta', prerelease: true}));
+});
+
+test('The "prerelease" branches must have unique "prerelease" property', t => {
+  t.true(prerelease.branchesValidator([{prerelease: 'beta'}, {prerelease: 'alpha'}]));
+
+  t.false(prerelease.branchesValidator([{range: 'beta'}, {range: 'beta'}, {range: 'alpha'}]));
+});
+
+test('A "release" branch is identified by not havin a "range" or "prerelease" property or a "name" formatted like "N.x", "N.x.x" or "N.N.x"', t => {
+  t.true(release.filter({name: 'some-name'}));
+
+  t.false(release.filter({name: '1.x.x'}));
+  t.false(release.filter({name: '1.0.x'}));
+  t.false(release.filter({name: 'some-name', range: '1.x.x'}));
+  t.false(release.filter({name: 'some-name', range: '1.1.x'}));
+  t.false(release.filter({name: 'some-name', prerelease: true}));
+  t.false(release.filter({name: 'some-name', prerelease: 'beta'}));
+});
+
+test('There must be between 1 and 3 release branches', t => {
+  t.true(release.branchesValidator([{name: 'branch1'}]));
+  t.true(release.branchesValidator([{name: 'branch1'}, {name: 'branch2'}]));
+  t.true(release.branchesValidator([{name: 'branch1'}, {name: 'branch2'}, {name: 'branch3'}]));
+
+  t.false(release.branchesValidator([]));
+  t.false(release.branchesValidator([{name: 'branch1'}, {name: 'branch2'}, {name: 'branch3'}, {name: 'branch4'}]));
+});
@@ -33,6 +33,16 @@ test('The "publish" plugin output, if defined, must be an object or "false"', t
  t.true(plugins.publish.outputValidator(false));
 });

+test('The "addChannel" plugin output, if defined, must be an object', t => {
+  t.false(plugins.addChannel.outputValidator(1));
+  t.false(plugins.addChannel.outputValidator('string'));
+
+  t.true(plugins.addChannel.outputValidator({}));
+  t.true(plugins.addChannel.outputValidator());
+  t.true(plugins.addChannel.outputValidator(null));
+  t.true(plugins.addChannel.outputValidator(''));
+});
+
 test('The "generateNotes" plugins output are concatenated with separator and sensitive data is hidden', t => {
  const env = {MY_TOKEN: 'secret token'};
  t.is(plugins.generateNotes.postprocess(['note 1', 'note 2'], {env}), `note 1${RELEASE_NOTES_SEPARATOR}note 2`);
@@ -66,6 +66,25 @@ test('Get all commits since gitHead (from lastRelease) on a detached head repo',
  t.truthy(result[0].committer.name);
 });

+test('Get all commits between lastRelease.gitHead and a shas', async t => {
+  // Create a git repository, set the current working directory at the root of the repo
+  const {cwd} = await gitRepo();
+  // Add commits to the master branch
+  const commits = await gitCommits(['First', 'Second', 'Third'], {cwd});
+
+  // Retrieve the commits with the commits module, between commit 'First' and 'Third'
+  const result = await getCommits({
+    cwd,
+    lastRelease: {gitHead: commits[commits.length - 1].hash},
+    nextRelease: {gitHead: commits[1].hash},
+    logger: t.context.logger,
+  });
+
+  // Verify the commits created and retrieved by the module are identical
+  t.is(result.length, 1);
+  t.deepEqual(result, commits.slice(1, commits.length - 1));
+});
+
 test('Return empty array if lastRelease.gitHead is the last commit', async t => {
  // Create a git repository, set the current working directory at the root of the repo
  const {cwd} = await gitRepo();
@@ -6,7 +6,7 @@ import {omit} from 'lodash';
 import proxyquire from 'proxyquire';
 import {stub} from 'sinon';
 import yaml from 'js-yaml';
-import {gitRepo, gitCommits, gitShallowClone, gitAddConfig} from './helpers/git-utils';
+import {gitRepo, gitTagVersion, gitCommits, gitShallowClone, gitAddConfig} from './helpers/git-utils';

 const DEFAULT_PLUGINS = [
  '@semantic-release/commit-analyzer',
@@ -23,8 +23,10 @@ test.beforeEach(t => {
 test('Default values, reading repositoryUrl from package.json', async t => {
  const pkg = {repository: 'https://host.null/owner/package.git'};
  // Create a git repository, set the current working directory at the root of the repo
-  const {cwd} = await gitRepo();
+  const {cwd} = await gitRepo(true);
  await gitCommits(['First'], {cwd});
+  await gitTagVersion('v1.0.0', undefined, {cwd});
+  await gitTagVersion('v1.1.0', undefined, {cwd});
  // Add remote.origin.url config
  await gitAddConfig('remote.origin.url', 'git@host.null:owner/repo.git', {cwd});
  // Create package.json in repository root
@@ -33,21 +35,35 @@ test('Default values, reading repositoryUrl from package.json', async t => {
  const {options: result} = await t.context.getConfig({cwd});

  // Verify the default options are set
-  t.is(result.branch, 'master');
+  t.deepEqual(result.branches, [
+    '+([0-9])?(.{+([0-9]),x}).x',
+    'master',
+    'next',
+    'next-major',
+    {name: 'beta', prerelease: true},
+    {name: 'alpha', prerelease: true},
+  ]);
  t.is(result.repositoryUrl, 'https://host.null/owner/package.git');
  t.is(result.tagFormat, `v\${version}`);
 });

 test('Default values, reading repositoryUrl from repo if not set in package.json', async t => {
  // Create a git repository, set the current working directory at the root of the repo
-  const {cwd} = await gitRepo();
+  const {cwd} = await gitRepo(true);
  // Add remote.origin.url config
  await gitAddConfig('remote.origin.url', 'https://host.null/owner/module.git', {cwd});

  const {options: result} = await t.context.getConfig({cwd});

  // Verify the default options are set
-  t.is(result.branch, 'master');
+  t.deepEqual(result.branches, [
+    '+([0-9])?(.{+([0-9]),x}).x',
+    'master',
+    'next',
+    'next-major',
+    {name: 'beta', prerelease: true},
+    {name: 'alpha', prerelease: true},
+  ]);
  t.is(result.repositoryUrl, 'https://host.null/owner/module.git');
  t.is(result.tagFormat, `v\${version}`);
 });
@@ -62,7 +78,14 @@ test('Default values, reading repositoryUrl (http url) from package.json if not
  const {options: result} = await t.context.getConfig({cwd});

  // Verify the default options are set
-  t.is(result.branch, 'master');
+  t.deepEqual(result.branches, [
+    '+([0-9])?(.{+([0-9]),x}).x',
+    'master',
+    'next',
+    'next-major',
+    {name: 'beta', prerelease: true},
+    {name: 'alpha', prerelease: true},
+  ]);
  t.is(result.repositoryUrl, 'https://host.null/owner/module.git');
  t.is(result.tagFormat, `v\${version}`);
 });
@@ -85,7 +108,7 @@ test('Read options from package.json', async t => {
  const options = {
    analyzeCommits: {path: 'analyzeCommits', param: 'analyzeCommits_param'},
    generateNotes: 'generateNotes',
-    branch: 'test_branch',
+    branches: ['test_branch'],
    repositoryUrl: 'https://host.null/owner/module.git',
    tagFormat: `v\${version}`,
    plugins: false,
@@ -95,10 +118,11 @@ test('Read options from package.json', async t => {

  const {options: result} = await t.context.getConfig({cwd});

+  const expected = {...options, branches: ['test_branch']};
  // Verify the options contains the plugin config from package.json
-  t.deepEqual(result, options);
+  t.deepEqual(result, expected);
  // Verify the plugins module is called with the plugin options from package.json
-  t.deepEqual(t.context.plugins.args[0][0], {cwd, options});
+  t.deepEqual(t.context.plugins.args[0][0], {options: expected, cwd});
 });

 test('Read options from .releaserc.yml', async t => {
@@ -106,7 +130,7 @@ test('Read options from .releaserc.yml', async t => {
  const {cwd} = await gitRepo();
  const options = {
    analyzeCommits: {path: 'analyzeCommits', param: 'analyzeCommits_param'},
-    branch: 'test_branch',
+    branches: ['test_branch'],
    repositoryUrl: 'https://host.null/owner/module.git',
    tagFormat: `v\${version}`,
    plugins: false,
@@ -116,10 +140,11 @@ test('Read options from .releaserc.yml', async t => {

  const {options: result} = await t.context.getConfig({cwd});

+  const expected = {...options, branches: ['test_branch']};
  // Verify the options contains the plugin config from package.json
-  t.deepEqual(result, options);
+  t.deepEqual(result, expected);
  // Verify the plugins module is called with the plugin options from package.json
-  t.deepEqual(t.context.plugins.args[0][0], {cwd, options});
+  t.deepEqual(t.context.plugins.args[0][0], {options: expected, cwd});
 });

 test('Read options from .releaserc.json', async t => {
@@ -127,7 +152,7 @@ test('Read options from .releaserc.json', async t => {
  const {cwd} = await gitRepo();
  const options = {
    analyzeCommits: {path: 'analyzeCommits', param: 'analyzeCommits_param'},
-    branch: 'test_branch',
+    branches: ['test_branch'],
    repositoryUrl: 'https://host.null/owner/module.git',
    tagFormat: `v\${version}`,
    plugins: false,
@@ -137,10 +162,11 @@ test('Read options from .releaserc.json', async t => {

  const {options: result} = await t.context.getConfig({cwd});

+  const expected = {...options, branches: ['test_branch']};
  // Verify the options contains the plugin config from package.json
-  t.deepEqual(result, options);
+  t.deepEqual(result, expected);
  // Verify the plugins module is called with the plugin options from package.json
-  t.deepEqual(t.context.plugins.args[0][0], {cwd, options});
+  t.deepEqual(t.context.plugins.args[0][0], {options: expected, cwd});
 });

 test('Read options from .releaserc.js', async t => {
@@ -148,7 +174,7 @@ test('Read options from .releaserc.js', async t => {
  const {cwd} = await gitRepo();
  const options = {
    analyzeCommits: {path: 'analyzeCommits', param: 'analyzeCommits_param'},
-    branch: 'test_branch',
+    branches: ['test_branch'],
    repositoryUrl: 'https://host.null/owner/module.git',
    tagFormat: `v\${version}`,
    plugins: false,
@@ -158,10 +184,11 @@ test('Read options from .releaserc.js', async t => {

  const {options: result} = await t.context.getConfig({cwd});

+  const expected = {...options, branches: ['test_branch']};
  // Verify the options contains the plugin config from package.json
-  t.deepEqual(result, options);
+  t.deepEqual(result, expected);
  // Verify the plugins module is called with the plugin options from package.json
-  t.deepEqual(t.context.plugins.args[0][0], {cwd, options});
+  t.deepEqual(t.context.plugins.args[0][0], {options: expected, cwd});
 });

 test('Read options from release.config.js', async t => {
@@ -169,7 +196,7 @@ test('Read options from release.config.js', async t => {
  const {cwd} = await gitRepo();
  const options = {
    analyzeCommits: {path: 'analyzeCommits', param: 'analyzeCommits_param'},
-    branch: 'test_branch',
+    branches: ['test_branch'],
    repositoryUrl: 'https://host.null/owner/module.git',
    tagFormat: `v\${version}`,
    plugins: false,
@@ -179,10 +206,11 @@ test('Read options from release.config.js', async t => {

  const {options: result} = await t.context.getConfig({cwd});

+  const expected = {...options, branches: ['test_branch']};
  // Verify the options contains the plugin config from package.json
-  t.deepEqual(result, options);
+  t.deepEqual(result, expected);
  // Verify the plugins module is called with the plugin options from package.json
-  t.deepEqual(t.context.plugins.args[0][0], {cwd, options});
+  t.deepEqual(t.context.plugins.args[0][0], {options: expected, cwd});
 });

 test('Prioritise CLI/API parameters over file configuration and git repo', async t => {
@@ -193,11 +221,11 @@ test('Prioritise CLI/API parameters over file configuration and git repo', async
  cwd = await gitShallowClone(repositoryUrl);
  const pkgOptions = {
    analyzeCommits: {path: 'analyzeCommits', param: 'analyzeCommits_pkg'},
-    branch: 'branch_pkg',
+    branches: ['branch_pkg'],
  };
  const options = {
    analyzeCommits: {path: 'analyzeCommits', param: 'analyzeCommits_cli'},
-    branch: 'branch_cli',
+    branches: ['branch_cli'],
    repositoryUrl: 'http://cli-url.com/owner/package',
    tagFormat: `cli\${version}`,
    plugins: false,
@@ -208,10 +236,11 @@ test('Prioritise CLI/API parameters over file configuration and git repo', async

  const result = await t.context.getConfig({cwd}, options);

+  const expected = {...options, branches: ['branch_cli']};
  // Verify the options contains the plugin config from CLI/API
-  t.deepEqual(result.options, options);
+  t.deepEqual(result.options, expected);
  // Verify the plugins module is called with the plugin options from CLI/API
-  t.deepEqual(t.context.plugins.args[0][0], {cwd, options});
+  t.deepEqual(t.context.plugins.args[0][0], {options: expected, cwd});
 });

 test('Read configuration from file path in "extends"', async t => {
@@ -221,7 +250,7 @@ test('Read configuration from file path in "extends"', async t => {
  const options = {
    analyzeCommits: {path: 'analyzeCommits', param: 'analyzeCommits_param'},
    generateNotes: 'generateNotes',
-    branch: 'test_branch',
+    branches: ['test_branch'],
    repositoryUrl: 'https://host.null/owner/module.git',
    tagFormat: `v\${version}`,
    plugins: ['plugin-1', ['plugin-2', {plugin2Opt: 'value'}]],
@@ -232,10 +261,11 @@ test('Read configuration from file path in "extends"', async t => {

  const {options: result} = await t.context.getConfig({cwd});

+  const expected = {...options, branches: ['test_branch']};
  // Verify the options contains the plugin config from shareable.json
-  t.deepEqual(result, options);
+  t.deepEqual(result, expected);
  // Verify the plugins module is called with the plugin options from shareable.json
-  t.deepEqual(t.context.plugins.args[0][0], {cwd, options});
+  t.deepEqual(t.context.plugins.args[0][0], {options: expected, cwd});
  t.deepEqual(t.context.plugins.args[0][1], {
    analyzeCommits: './shareable.json',
    generateNotes: './shareable.json',
@@ -251,7 +281,7 @@ test('Read configuration from module path in "extends"', async t => {
  const options = {
    analyzeCommits: {path: 'analyzeCommits', param: 'analyzeCommits_param'},
    generateNotes: 'generateNotes',
-    branch: 'test_branch',
+    branches: ['test_branch'],
    repositoryUrl: 'https://host.null/owner/module.git',
    tagFormat: `v\${version}`,
    plugins: false,
@@ -260,12 +290,13 @@ test('Read configuration from module path in "extends"', async t => {
  await outputJson(path.resolve(cwd, 'package.json'), {release: pkgOptions});
  await outputJson(path.resolve(cwd, 'node_modules/shareable/index.json'), options);

-  const {options: results} = await t.context.getConfig({cwd});
+  const {options: result} = await t.context.getConfig({cwd});

+  const expected = {...options, branches: ['test_branch']};
  // Verify the options contains the plugin config from shareable.json
-  t.deepEqual(results, options);
+  t.deepEqual(result, expected);
  // Verify the plugins module is called with the plugin options from shareable.json
-  t.deepEqual(t.context.plugins.args[0][0], {cwd, options});
+  t.deepEqual(t.context.plugins.args[0][0], {options: expected, cwd});
  t.deepEqual(t.context.plugins.args[0][1], {
    analyzeCommits: 'shareable',
    generateNotes: 'shareable',
@@ -279,14 +310,14 @@ test('Read configuration from an array of paths in "extends"', async t => {
  const options1 = {
    verifyRelease: 'verifyRelease1',
    analyzeCommits: {path: 'analyzeCommits1', param: 'analyzeCommits_param1'},
-    branch: 'test_branch',
+    branches: ['test_branch'],
    repositoryUrl: 'https://host.null/owner/module.git',
  };
  const options2 = {
    verifyRelease: 'verifyRelease2',
    generateNotes: 'generateNotes2',
    analyzeCommits: {path: 'analyzeCommits2', param: 'analyzeCommits_param2'},
-    branch: 'test_branch',
+    branches: ['test_branch'],
    tagFormat: `v\${version}`,
    plugins: false,
  };
@@ -295,12 +326,13 @@ test('Read configuration from an array of paths in "extends"', async t => {
  await outputJson(path.resolve(cwd, 'shareable1.json'), options1);
  await outputJson(path.resolve(cwd, 'shareable2.json'), options2);

-  const {options: results} = await t.context.getConfig({cwd});
+  const {options: result} = await t.context.getConfig({cwd});

+  const expected = {...options1, ...options2, branches: ['test_branch']};
  // Verify the options contains the plugin config from shareable1.json and shareable2.json
-  t.deepEqual(results, {...options1, ...options2});
+  t.deepEqual(result, expected);
  // Verify the plugins module is called with the plugin options from shareable1.json and shareable2.json
-  t.deepEqual(t.context.plugins.args[0][0], {cwd, options: {...options1, ...options2}});
+  t.deepEqual(t.context.plugins.args[0][0], {options: expected, cwd});
  t.deepEqual(t.context.plugins.args[0][1], {
    verifyRelease1: './shareable1.json',
    verifyRelease2: './shareable2.json',
@@ -315,7 +347,7 @@ test('Prioritize configuration from config file over "extends"', async t => {
  const {cwd} = await gitRepo();
  const pkgOptions = {
    extends: './shareable.json',
-    branch: 'test_pkg',
+    branches: ['test_pkg'],
    generateNotes: 'generateNotes',
    publish: [{path: 'publishPkg', param: 'publishPkg_param'}],
  };
@@ -323,7 +355,7 @@ test('Prioritize configuration from config file over "extends"', async t => {
    analyzeCommits: 'analyzeCommits',
    generateNotes: 'generateNotesShareable',
    publish: [{path: 'publishShareable', param: 'publishShareable_param'}],
-    branch: 'test_branch',
+    branches: ['test_branch'],
    repositoryUrl: 'https://host.null/owner/module.git',
    tagFormat: `v\${version}`,
    plugins: false,
@@ -332,12 +364,13 @@ test('Prioritize configuration from config file over "extends"', async t => {
  await outputJson(path.resolve(cwd, 'package.json'), {release: pkgOptions});
  await outputJson(path.resolve(cwd, 'shareable.json'), options1);

-  const {options} = await t.context.getConfig({cwd});
+  const {options: result} = await t.context.getConfig({cwd});

+  const expected = omit({...options1, ...pkgOptions, branches: ['test_pkg']}, 'extends');
  // Verify the options contains the plugin config from package.json and shareable.json
-  t.deepEqual(options, omit({...options1, ...pkgOptions}, 'extends'));
+  t.deepEqual(result, expected);
  // Verify the plugins module is called with the plugin options from package.json and shareable.json
-  t.deepEqual(t.context.plugins.args[0][0], {cwd, options: omit({...options, ...pkgOptions}, 'extends')});
+  t.deepEqual(t.context.plugins.args[0][0], {options: expected, cwd});
  t.deepEqual(t.context.plugins.args[0][1], {
    analyzeCommits: './shareable.json',
    generateNotesShareable: './shareable.json',
@@ -350,13 +383,13 @@ test('Prioritize configuration from cli/API options over "extends"', async t =>
  const {cwd} = await gitRepo();
  const cliOptions = {
    extends: './shareable2.json',
-    branch: 'branch_opts',
+    branches: ['branch_opts'],
    publish: [{path: 'publishOpts', param: 'publishOpts_param'}],
    repositoryUrl: 'https://host.null/owner/module.git',
  };
  const pkgOptions = {
    extends: './shareable1.json',
-    branch: 'branch_pkg',
+    branches: ['branch_pkg'],
    generateNotes: 'generateNotes',
    publish: [{path: 'publishPkg', param: 'publishPkg_param'}],
  };
@@ -364,13 +397,13 @@ test('Prioritize configuration from cli/API options over "extends"', async t =>
    analyzeCommits: 'analyzeCommits1',
    generateNotes: 'generateNotesShareable1',
    publish: [{path: 'publishShareable', param: 'publishShareable_param1'}],
-    branch: 'test_branch1',
+    branches: ['test_branch1'],
    repositoryUrl: 'https://host.null/owner/module.git',
  };
  const options2 = {
    analyzeCommits: 'analyzeCommits2',
    publish: [{path: 'publishShareable', param: 'publishShareable_param2'}],
-    branch: 'test_branch2',
+    branches: ['test_branch2'],
    tagFormat: `v\${version}`,
    plugins: false,
  };
@@ -379,15 +412,13 @@ test('Prioritize configuration from cli/API options over "extends"', async t =>
  await outputJson(path.resolve(cwd, 'shareable1.json'), options1);
  await outputJson(path.resolve(cwd, 'shareable2.json'), options2);

-  const {options} = await t.context.getConfig({cwd}, cliOptions);
+  const {options: result} = await t.context.getConfig({cwd}, cliOptions);

+  const expected = omit({...options2, ...pkgOptions, ...cliOptions, branches: ['branch_opts']}, 'extends');
  // Verify the options contains the plugin config from package.json and shareable2.json
-  t.deepEqual(options, omit({...options2, ...pkgOptions, ...cliOptions}, 'extends'));
+  t.deepEqual(result, expected);
  // Verify the plugins module is called with the plugin options from package.json and shareable2.json
-  t.deepEqual(t.context.plugins.args[0][0], {
-    cwd,
-    options: omit({...options2, ...pkgOptions, ...cliOptions}, 'extends'),
-  });
+  t.deepEqual(t.context.plugins.args[0][0], {options: expected, cwd});
 });

 test('Allow to unset properties defined in shareable config with "null"', async t => {
@@ -396,7 +427,7 @@ test('Allow to unset properties defined in shareable config with "null"', async
  const pkgOptions = {
    extends: './shareable.json',
    analyzeCommits: null,
-    branch: 'test_branch',
+    branches: ['test_branch'],
    repositoryUrl: 'https://host.null/owner/module.git',
    plugins: null,
  };
@@ -427,6 +458,7 @@ test('Allow to unset properties defined in shareable config with "null"', async
    },
    cwd,
  });
+
  t.deepEqual(t.context.plugins.args[0][1], {
    generateNotes: './shareable.json',
    analyzeCommits: './shareable.json',
@@ -440,7 +472,7 @@ test('Allow to unset properties defined in shareable config with "undefined"', a
  const pkgOptions = {
    extends: './shareable.json',
    analyzeCommits: undefined,
-    branch: 'test_branch',
+    branches: ['test_branch'],
    repositoryUrl: 'https://host.null/owner/module.git',
  };
  const options1 = {
@@ -453,18 +485,17 @@ test('Allow to unset properties defined in shareable config with "undefined"', a
  await writeFile(path.resolve(cwd, 'release.config.js'), `module.exports = ${format(pkgOptions)}`);
  await outputJson(path.resolve(cwd, 'shareable.json'), options1);

-  const {options} = await t.context.getConfig({cwd});
+  const {options: result} = await t.context.getConfig({cwd});

+  const expected = {
+    ...omit(options1, 'analyzeCommits'),
+    ...omit(pkgOptions, ['extends', 'analyzeCommits']),
+    branches: ['test_branch'],
+  };
  // Verify the options contains the plugin config from shareable.json
-  t.deepEqual(options, {...omit(options1, 'analyzeCommits'), ...omit(pkgOptions, ['extends', 'analyzeCommits'])});
+  t.deepEqual(result, expected);
  // Verify the plugins module is called with the plugin options from shareable.json
-  t.deepEqual(t.context.plugins.args[0][0], {
-    options: {
-      ...omit(options1, 'analyzeCommits'),
-      ...omit(pkgOptions, ['extends', 'analyzeCommits']),
-    },
-    cwd,
-  });
+  t.deepEqual(t.context.plugins.args[0][0], {options: expected, cwd});
  t.deepEqual(t.context.plugins.args[0][1], {
    generateNotes: './shareable.json',
    analyzeCommits: './shareable.json',
@@ -482,6 +513,6 @@ test('Throw an Error if one of the shareable config cannot be found', async t =>

  const error = await t.throwsAsync(t.context.getConfig({cwd}), Error);

-  t.is(error.message, "Cannot find module 'non-existing-path'");
+  t.regex(error.message, /Cannot find module 'non-existing-path'/);
  t.is(error.code, 'MODULE_NOT_FOUND');
 });
@@ -8,7 +8,7 @@ test('Return the same "git" formatted URL if "gitCredentials" is not defined', a
  const {cwd} = await gitRepo();

  t.is(
-    await getAuthUrl({cwd, env, options: {branch: 'master', repositoryUrl: 'git@host.null:owner/repo.git'}}),
+    await getAuthUrl({cwd, env, branch: {name: 'master'}, options: {repositoryUrl: 'git@host.null:owner/repo.git'}}),
    'git@host.null:owner/repo.git'
  );
 });
@@ -17,7 +17,12 @@ test('Return the same "https" formatted URL if "gitCredentials" is not defined',
  const {cwd} = await gitRepo();

  t.is(
-    await getAuthUrl({cwd, env, options: {branch: 'master', repositoryUrl: 'https://host.null/owner/repo.git'}}),
+    await getAuthUrl({
+      cwd,
+      env,
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'https://host.null/owner/repo.git'},
+    }),
    'https://host.null/owner/repo.git'
  );
 });
@@ -26,7 +31,12 @@ test('Return the "https" formatted URL if "gitCredentials" is not defined and re
  const {cwd} = await gitRepo();

  t.is(
-    await getAuthUrl({cwd, env, options: {branch: 'master', repositoryUrl: 'git+https://host.null/owner/repo.git'}}),
+    await getAuthUrl({
+      cwd,
+      env,
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'git+https://host.null/owner/repo.git'},
+    }),
    'https://host.null/owner/repo.git'
  );
 });
@@ -35,7 +45,7 @@ test('Do not add trailing ".git" if not present in the origian URL', async t =>
  const {cwd} = await gitRepo();

  t.is(
-    await getAuthUrl({cwd, env, options: {branch: 'master', repositoryUrl: 'git@host.null:owner/repo'}}),
+    await getAuthUrl({cwd, env, vranch: {name: 'master'}, options: {repositoryUrl: 'git@host.null:owner/repo'}}),
    'git@host.null:owner/repo'
  );
 });
@@ -47,7 +57,8 @@ test('Handle "https" URL with group and subgroup', async t => {
    await getAuthUrl({
      cwd,
      env,
-      options: {branch: 'master', repositoryUrl: 'https://host.null/group/subgroup/owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'https://host.null/group/subgroup/owner/repo.git'},
    }),
    'https://host.null/group/subgroup/owner/repo.git'
  );
@@ -60,7 +71,8 @@ test('Handle "git" URL with group and subgroup', async t => {
    await getAuthUrl({
      cwd,
      env,
-      options: {branch: 'master', repositoryUrl: 'git@host.null:group/subgroup/owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'git@host.null:group/subgroup/owner/repo.git'},
    }),
    'git@host.null:group/subgroup/owner/repo.git'
  );
@@ -70,7 +82,12 @@ test('Convert shorthand URL', async t => {
  const {cwd} = await gitRepo();

  t.is(
-    await getAuthUrl({cwd, env, options: {repositoryUrl: 'semanitc-release/semanitc-release'}}),
+    await getAuthUrl({
+      cwd,
+      env,
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'semanitc-release/semanitc-release'},
+    }),
    'https://github.com/semanitc-release/semanitc-release.git'
  );
 });
@@ -82,7 +99,8 @@ test('Convert GitLab shorthand URL', async t => {
    await getAuthUrl({
      cwd,
      env,
-      options: {branch: 'master', repositoryUrl: 'gitlab:semanitc-release/semanitc-release'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'gitlab:semanitc-release/semanitc-release'},
    }),
    'https://gitlab.com/semanitc-release/semanitc-release.git'
  );
@@ -95,7 +113,8 @@ test('Return the "https" formatted URL if "gitCredentials" is defined and reposi
    await getAuthUrl({
      cwd,
      env: {...env, GIT_CREDENTIALS: 'user:pass'},
-      options: {branch: 'master', repositoryUrl: 'git@host.null:owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'git@host.null:owner/repo.git'},
    }),
    'https://user:pass@host.null/owner/repo.git'
  );
@@ -121,7 +140,8 @@ test('Return the "https" formatted URL if "gitCredentials" is defined and reposi
    await getAuthUrl({
      cwd,
      env: {...env, GIT_CREDENTIALS: 'user:pass'},
-      options: {branch: 'master', repositoryUrl: 'https://host.null/owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'https://host.null/owner/repo.git'},
    }),
    'https://user:pass@host.null/owner/repo.git'
  );
@@ -134,7 +154,8 @@ test('Return the "http" formatted URL if "gitCredentials" is defined and reposit
    await getAuthUrl({
      cwd,
      env: {...env, GIT_CREDENTIALS: 'user:pass'},
-      options: {branch: 'master', repositoryUrl: 'http://host.null/owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'http://host.null/owner/repo.git'},
    }),
    'http://user:pass@host.null/owner/repo.git'
  );
@@ -147,7 +168,8 @@ test('Return the "https" formatted URL if "gitCredentials" is defined and reposi
    await getAuthUrl({
      cwd,
      env: {...env, GIT_CREDENTIALS: 'user:pass'},
-      options: {branch: 'master', repositoryUrl: 'git+https://host.null/owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'git+https://host.null/owner/repo.git'},
    }),
    'https://user:pass@host.null/owner/repo.git'
  );
@@ -160,7 +182,8 @@ test('Return the "http" formatted URL if "gitCredentials" is defined and reposit
    await getAuthUrl({
      cwd,
      env: {...env, GIT_CREDENTIALS: 'user:pass'},
-      options: {branch: 'master', repositoryUrl: 'git+http://host.null/owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'git+http://host.null/owner/repo.git'},
    }),
    'http://user:pass@host.null/owner/repo.git'
  );
@@ -173,7 +196,8 @@ test('Return the "https" formatted URL if "gitCredentials" is defined with "GH_T
    await getAuthUrl({
      cwd,
      env: {...env, GH_TOKEN: 'token'},
-      options: {branch: 'master', repositoryUrl: 'git@host.null:owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'git@host.null:owner/repo.git'},
    }),
    'https://token@host.null/owner/repo.git'
  );
@@ -186,7 +210,8 @@ test('Return the "https" formatted URL if "gitCredentials" is defined with "GITH
    await getAuthUrl({
      cwd,
      env: {...env, GITHUB_TOKEN: 'token'},
-      options: {branch: 'master', repositoryUrl: 'git@host.null:owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'git@host.null:owner/repo.git'},
    }),
    'https://token@host.null/owner/repo.git'
  );
@@ -199,7 +224,8 @@ test('Return the "https" formatted URL if "gitCredentials" is defined with "GL_T
    await getAuthUrl({
      cwd,
      env: {...env, GL_TOKEN: 'token'},
-      options: {branch: 'master', repositoryUrl: 'git@host.null:owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'git@host.null:owner/repo.git'},
    }),
    'https://gitlab-ci-token:token@host.null/owner/repo.git'
  );
@@ -212,7 +238,8 @@ test('Return the "https" formatted URL if "gitCredentials" is defined with "GITL
    await getAuthUrl({
      cwd,
      env: {...env, GITLAB_TOKEN: 'token'},
-      options: {branch: 'master', repositoryUrl: 'git@host.null:owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'git@host.null:owner/repo.git'},
    }),
    'https://gitlab-ci-token:token@host.null/owner/repo.git'
  );
@@ -225,7 +252,8 @@ test('Return the "https" formatted URL if "gitCredentials" is defined with "BB_T
    await getAuthUrl({
      cwd,
      env: {...env, BB_TOKEN: 'token'},
-      options: {branch: 'master', repositoryUrl: 'git@host.null:owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'git@host.null:owner/repo.git'},
    }),
    'https://x-token-auth:token@host.null/owner/repo.git'
  );
@@ -238,7 +266,8 @@ test('Return the "https" formatted URL if "gitCredentials" is defined with "BITB
    await getAuthUrl({
      cwd,
      env: {...env, BITBUCKET_TOKEN: 'token'},
-      options: {branch: 'master', repositoryUrl: 'git@host.null:owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'git@host.null:owner/repo.git'},
    }),
    'https://x-token-auth:token@host.null/owner/repo.git'
  );
@@ -264,7 +293,8 @@ test('Handle "https" URL with group and subgroup, with "GIT_CREDENTIALS"', async
    await getAuthUrl({
      cwd,
      env: {...env, GIT_CREDENTIALS: 'user:pass'},
-      options: {branch: 'master', repositoryUrl: 'https://host.null/group/subgroup/owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'https://host.null/group/subgroup/owner/repo.git'},
    }),
    'https://user:pass@host.null/group/subgroup/owner/repo.git'
  );
@@ -277,7 +307,8 @@ test('Handle "git" URL with group and subgroup, with "GIT_CREDENTIALS', async t
    await getAuthUrl({
      cwd,
      env: {...env, GIT_CREDENTIALS: 'user:pass'},
-      options: {branch: 'master', repositoryUrl: 'git@host.null:group/subgroup/owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'git@host.null:group/subgroup/owner/repo.git'},
    }),
    'https://user:pass@host.null/group/subgroup/owner/repo.git'
  );
@@ -287,7 +318,12 @@ test('Do not add git credential to repositoryUrl if push is allowed', async t =>
  const {cwd, repositoryUrl} = await gitRepo(true);

  t.is(
-    await getAuthUrl({cwd, env: {...env, GIT_CREDENTIALS: 'user:pass'}, options: {branch: 'master', repositoryUrl}}),
+    await getAuthUrl({
+      cwd,
+      env: {...env, GIT_CREDENTIALS: 'user:pass'},
+      branch: {name: 'master'},
+      options: {repositoryUrl},
+    }),
    repositoryUrl
  );
 });
@@ -1,151 +1,80 @@
 import test from 'ava';
-import {stub} from 'sinon';
 import getLastRelease from '../lib/get-last-release';
-import {gitRepo, gitCommits, gitTagVersion, gitCheckout} from './helpers/git-utils';

-test.beforeEach(t => {
-  // Stub the logger functions
-  t.context.log = stub();
-  t.context.logger = {log: t.context.log};
+test('Get the highest non-prerelease valid tag', t => {
+  const result = getLastRelease({
+    branch: {
+      name: 'master',
+      tags: [
+        {version: '2.0.0', gitTag: 'v2.0.0', gitHead: '222'},
+        {version: '1.0.0', gitTag: 'v1.0.0', gitHead: '111'},
+        {version: '3.0.0-beta.1', gitTag: 'v3.0.0-beta.1@beta', gitHead: '333'},
+      ],
+      type: 'release',
+    },
+    options: {tagFormat: `v\${version}`},
+  });
+
+  t.deepEqual(result, {version: '2.0.0', gitTag: 'v2.0.0', name: 'v2.0.0', gitHead: '222', channel: undefined});
 });

-test('Get the highest non-prerelease valid tag', async t => {
-  // Create a git repository, set the current working directory at the root of the repo
-  const {cwd} = await gitRepo();
-  // Create some commits and tags
-  await gitCommits(['First'], {cwd});
-  await gitTagVersion('foo', undefined, {cwd});
-  const commits = await gitCommits(['Second'], {cwd});
-  await gitTagVersion('v2.0.0', undefined, {cwd});
-  await gitCommits(['Third'], {cwd});
-  await gitTagVersion('v1.0.0', undefined, {cwd});
-  await gitCommits(['Fourth'], {cwd});
-  await gitTagVersion('v3.0', undefined, {cwd});
-  await gitCommits(['Fifth'], {cwd});
-  await gitTagVersion('v3.0.0-beta.1', undefined, {cwd});
+test('Get the highest prerelease valid tag, ignoring other tags from other prerelease channels', t => {
+  const result = getLastRelease({
+    branch: {
+      name: 'beta',
+      prerelease: 'beta',
+      channel: 'beta',
+      tags: [
+        {version: '1.0.0-beta.1', gitTag: 'v1.0.0-beta.1@beta', gitHead: '111', channel: 'beta'},
+        {version: '1.0.0-beta.2', gitTag: 'v1.0.0-beta.2@beta', gitHead: '222', channel: 'beta'},
+        {version: '1.0.0-alpha.1', gitTag: 'v1.0.0-alpha.1@alpha', gitHead: '333', channel: 'alpha'},
+      ],
+      type: 'prerelease',
+    },
+    options: {tagFormat: `v\${version}`},
+  });

-  const result = await getLastRelease({cwd, options: {tagFormat: `v\${version}`}, logger: t.context.logger});
-
-  t.deepEqual(result, {gitHead: commits[0].hash, gitTag: 'v2.0.0', version: '2.0.0'});
-  t.deepEqual(t.context.log.args[0], ['Found git tag v2.0.0 associated with version 2.0.0']);
+  t.deepEqual(result, {
+    version: '1.0.0-beta.2',
+    gitTag: 'v1.0.0-beta.2@beta',
+    name: 'v1.0.0-beta.2',
+    gitHead: '222',
+    channel: 'beta',
+  });
 });

-test('Get the highest tag in the history of the current branch', async t => {
-  // Create a git repository, set the current working directory at the root of the repo
-  const {cwd} = await gitRepo();
-  // Add commit to the master branch
-  await gitCommits(['First'], {cwd});
-  // Create the tag corresponding to version 1.0.0
-  // Create the new branch 'other-branch' from master
-  await gitCheckout('other-branch', true, {cwd});
-  // Add commit to the 'other-branch' branch
-  await gitCommits(['Second'], {cwd});
-  // Create the tag corresponding to version 3.0.0
-  await gitTagVersion('v3.0.0', undefined, {cwd});
-  // Checkout master
-  await gitCheckout('master', false, {cwd});
-  // Add another commit to the master branch
-  const commits = await gitCommits(['Third'], {cwd});
-  // Create the tag corresponding to version 2.0.0
-  await gitTagVersion('v2.0.0', undefined, {cwd});
-
-  const result = await getLastRelease({cwd, options: {tagFormat: `v\${version}`}, logger: t.context.logger});
-
-  t.deepEqual(result, {gitHead: commits[0].hash, gitTag: 'v2.0.0', version: '2.0.0'});
-});
-
-test('Match the tag name from the begining of the string', async t => {
-  // Create a git repository, set the current working directory at the root of the repo
-  const {cwd} = await gitRepo();
-  const commits = await gitCommits(['First'], {cwd});
-  await gitTagVersion('prefix/v1.0.0', undefined, {cwd});
-  await gitTagVersion('prefix/v2.0.0', undefined, {cwd});
-  await gitTagVersion('other-prefix/v3.0.0', undefined, {cwd});
-
-  const result = await getLastRelease({cwd, options: {tagFormat: `prefix/v\${version}`}, logger: t.context.logger});
-
-  t.deepEqual(result, {gitHead: commits[0].hash, gitTag: 'prefix/v2.0.0', version: '2.0.0'});
-});
-
-test('Return empty object if no valid tag is found', async t => {
-  // Create a git repository, set the current working directory at the root of the repo
-  const {cwd} = await gitRepo();
-  // Create some commits and tags
-  await gitCommits(['First'], {cwd});
-  await gitTagVersion('foo', undefined, {cwd});
-  await gitCommits(['Second'], {cwd});
-  await gitTagVersion('v2.0.x', undefined, {cwd});
-  await gitCommits(['Third'], {cwd});
-  await gitTagVersion('v3.0', undefined, {cwd});
-
-  const result = await getLastRelease({cwd, options: {tagFormat: `v\${version}`}, logger: t.context.logger});
+test('Return empty object if no valid tag is found', t => {
+  const result = getLastRelease({
+    branch: {
+      name: 'master',
+      tags: [{version: '3.0.0-beta.1', gitTag: 'v3.0.0-beta.1@beta', gitHead: '111'}],
+      type: 'release',
+    },
+    options: {tagFormat: `v\${version}`},
+  });

  t.deepEqual(result, {});
-  t.is(t.context.log.args[0][0], 'No git tag version found');
 });

-test('Return empty object if no valid tag is found in history', async t => {
-  // Create a git repository, set the current working directory at the root of the repo
-  const {cwd} = await gitRepo();
-  await gitCommits(['First'], {cwd});
-  await gitCheckout('other-branch', true, {cwd});
-  await gitCommits(['Second'], {cwd});
-  await gitTagVersion('v1.0.0', undefined, {cwd});
-  await gitTagVersion('v2.0.0', undefined, {cwd});
-  await gitTagVersion('v3.0.0', undefined, {cwd});
-  await gitCheckout('master', false, {cwd});
+test('Get the highest non-prerelease valid tag before a certain version', t => {
+  const result = getLastRelease(
+    {
+      branch: {
+        name: 'master',
+        channel: undefined,
+        tags: [
+          {version: '2.0.0', gitTag: 'v2.0.0', gitHead: '333'},
+          {version: '1.0.0', gitTag: 'v1.0.0', gitHead: '111'},
+          {version: '2.0.0-beta.1', gitTag: 'v2.0.0-beta.1@beta', gitHead: '222'},
+          {version: '2.1.0', gitTag: 'v2.1.0', gitHead: '444'},
+          {version: '2.1.1', gitTag: 'v2.1.1', gitHead: '555'},
+        ],
+        type: 'release',
+      },
+      options: {tagFormat: `v\${version}`},
+    },
+    {before: '2.1.0'}
+  );

-  const result = await getLastRelease({cwd, options: {tagFormat: `v\${version}`}, logger: t.context.logger});
-
-  t.deepEqual(result, {});
-  t.is(t.context.log.args[0][0], 'No git tag version found');
-});
-
-test('Get the highest valid tag corresponding to the "tagFormat"', async t => {
-  // Create a git repository, set the current working directory at the root of the repo
-  const {cwd} = await gitRepo();
-  // Create some commits and tags
-  const [{hash: gitHead}] = await gitCommits(['First'], {cwd});
-
-  await gitTagVersion('1.0.0', undefined, {cwd});
-  t.deepEqual(await getLastRelease({cwd, options: {tagFormat: `\${version}`}, logger: t.context.logger}), {
-    gitHead,
-    gitTag: '1.0.0',
-    version: '1.0.0',
-  });
-
-  await gitTagVersion('foo-1.0.0-bar', undefined, {cwd});
-  t.deepEqual(await getLastRelease({cwd, options: {tagFormat: `foo-\${version}-bar`}, logger: t.context.logger}), {
-    gitHead,
-    gitTag: 'foo-1.0.0-bar',
-    version: '1.0.0',
-  });
-
-  await gitTagVersion('foo-v1.0.0-bar', undefined, {cwd});
-  t.deepEqual(await getLastRelease({cwd, options: {tagFormat: `foo-v\${version}-bar`}, logger: t.context.logger}), {
-    gitHead,
-    gitTag: 'foo-v1.0.0-bar',
-    version: '1.0.0',
-  });
-
-  await gitTagVersion('(.+)/1.0.0/(a-z)', undefined, {cwd});
-  t.deepEqual(await getLastRelease({cwd, options: {tagFormat: `(.+)/\${version}/(a-z)`}, logger: t.context.logger}), {
-    gitHead,
-    gitTag: '(.+)/1.0.0/(a-z)',
-    version: '1.0.0',
-  });
-
-  await gitTagVersion('2.0.0-1.0.0-bar.1', undefined, {cwd});
-  t.deepEqual(await getLastRelease({cwd, options: {tagFormat: `2.0.0-\${version}-bar.1`}, logger: t.context.logger}), {
-    gitHead,
-    gitTag: '2.0.0-1.0.0-bar.1',
-    version: '1.0.0',
-  });
-
-  await gitTagVersion('3.0.0-bar.1', undefined, {cwd});
-  t.deepEqual(await getLastRelease({cwd, options: {tagFormat: `\${version}-bar.1`}, logger: t.context.logger}), {
-    gitHead,
-    gitTag: '3.0.0-bar.1',
-    version: '3.0.0',
-  });
+  t.deepEqual(result, {version: '2.0.0', gitTag: 'v2.0.0', name: 'v2.0.0', gitHead: '333', channel: undefined});
 });
@@ -9,33 +9,157 @@ test.beforeEach(t => {
 });

 test('Increase version for patch release', t => {
-  const version = getNextVersion({
-    nextRelease: {type: 'patch'},
-    lastRelease: {version: '1.0.0'},
-    logger: t.context.logger,
-  });
-  t.is(version, '1.0.1');
+  t.is(
+    getNextVersion({
+      branch: {name: 'master', type: 'release'},
+      nextRelease: {type: 'patch'},
+      lastRelease: {version: '1.0.0'},
+      logger: t.context.logger,
+    }),
+    '1.0.1'
+  );
 });

 test('Increase version for minor release', t => {
-  const version = getNextVersion({
-    nextRelease: {type: 'minor'},
-    lastRelease: {version: '1.0.0'},
-    logger: t.context.logger,
-  });
-  t.is(version, '1.1.0');
+  t.is(
+    getNextVersion({
+      branch: {name: 'master', type: 'release'},
+      nextRelease: {type: 'minor'},
+      lastRelease: {version: '1.0.0'},
+      logger: t.context.logger,
+    }),
+    '1.1.0'
+  );
 });

 test('Increase version for major release', t => {
-  const version = getNextVersion({
-    nextRelease: {type: 'major'},
-    lastRelease: {version: '1.0.0'},
-    logger: t.context.logger,
-  });
-  t.is(version, '2.0.0');
+  t.is(
+    getNextVersion({
+      branch: {name: 'master', type: 'release'},
+      nextRelease: {type: 'major'},
+      lastRelease: {version: '1.0.0'},
+      logger: t.context.logger,
+    }),
+    '2.0.0'
+  );
 });

 test('Return 1.0.0 if there is no previous release', t => {
-  const version = getNextVersion({nextRelease: {type: 'minor'}, lastRelease: {}, logger: t.context.logger});
-  t.is(version, '1.0.0');
+  t.is(
+    getNextVersion({
+      branch: {name: 'master', type: 'release'},
+      nextRelease: {type: 'minor'},
+      lastRelease: {},
+      logger: t.context.logger,
+    }),
+    '1.0.0'
+  );
+});
+
+test('Increase version for patch release on prerelease branch', t => {
+  t.is(
+    getNextVersion({
+      branch: {name: 'beta', type: 'prerelease', prerelease: 'beta'},
+      nextRelease: {type: 'patch'},
+      lastRelease: {version: '1.0.0'},
+      logger: t.context.logger,
+    }),
+    '1.0.1-beta.1'
+  );
+
+  t.is(
+    getNextVersion({
+      branch: {name: 'beta', type: 'prerelease', prerelease: 'beta'},
+      nextRelease: {type: 'patch'},
+      lastRelease: {version: '1.0.0-beta.1'},
+      logger: t.context.logger,
+    }),
+    '1.0.0-beta.2'
+  );
+
+  t.is(
+    getNextVersion({
+      branch: {name: 'alpha', type: 'prerelease', prerelease: 'alpha'},
+      nextRelease: {type: 'patch', channel: 'alpha'},
+      lastRelease: {version: '1.0.0-beta.1', channel: 'beta'},
+      logger: t.context.logger,
+    }),
+    '1.0.1-alpha.1'
+  );
+});
+
+test('Increase version for minor release on prerelease branch', t => {
+  t.is(
+    getNextVersion({
+      branch: {name: 'beta', type: 'prerelease', prerelease: 'beta'},
+      nextRelease: {type: 'minor'},
+      lastRelease: {version: '1.0.0'},
+      logger: t.context.logger,
+    }),
+    '1.1.0-beta.1'
+  );
+
+  t.is(
+    getNextVersion({
+      branch: {name: 'beta', type: 'prerelease', prerelease: 'beta'},
+      nextRelease: {type: 'minor'},
+      lastRelease: {version: '1.0.0-beta.1'},
+      logger: t.context.logger,
+    }),
+    '1.0.0-beta.2'
+  );
+
+  t.is(
+    getNextVersion({
+      branch: {name: 'alpha', type: 'prerelease', prerelease: 'alpha'},
+      nextRelease: {type: 'minor', channel: 'alpha'},
+      lastRelease: {version: '1.0.0-beta.1', channel: 'beta'},
+      logger: t.context.logger,
+    }),
+    '1.1.0-alpha.1'
+  );
+});
+
+test('Increase version for major release on prerelease branch', t => {
+  t.is(
+    getNextVersion({
+      branch: {name: 'beta', type: 'prerelease', prerelease: 'beta'},
+      nextRelease: {type: 'major'},
+      lastRelease: {version: '1.0.0'},
+      logger: t.context.logger,
+    }),
+    '2.0.0-beta.1'
+  );
+
+  t.is(
+    getNextVersion({
+      branch: {name: 'beta', type: 'prerelease', prerelease: 'beta'},
+      nextRelease: {type: 'major'},
+      lastRelease: {version: '1.0.0-beta.1'},
+      logger: t.context.logger,
+    }),
+    '1.0.0-beta.2'
+  );
+
+  t.is(
+    getNextVersion({
+      branch: {name: 'alpha', type: 'prerelease', prerelease: 'alpha'},
+      nextRelease: {type: 'major', channel: 'alpha'},
+      lastRelease: {version: '1.0.0-beta.1', channel: 'beta'},
+      logger: t.context.logger,
+    }),
+    '2.0.0-alpha.1'
+  );
+});
+
+test('Return 1.0.0 if there is no previous release on prerelease branch', t => {
+  t.is(
+    getNextVersion({
+      branch: {name: 'beta', type: 'prerelease', prerelease: 'beta'},
+      nextRelease: {type: 'minor'},
+      lastRelease: {},
+      logger: t.context.logger,
+    }),
+    '1.0.0-beta.1'
+  );
 });
@@ -0,0 +1,313 @@
+import test from 'ava';
+import getReleasesToAdd from '../lib/get-releases-to-add';
+
+test('Return versions merged from release to maintenance branch, excluding lower than branch start range', t => {
+  const result = getReleasesToAdd({
+    branch: {
+      name: '2.x',
+      channel: '2.x',
+      type: 'maintenance',
+      mergeRange: '>=2.0.0 <3.0.0',
+      tags: [
+        {gitTag: 'v2.0.0@2.x', version: '2.0.0', channel: '2.x', gitHead: '111'},
+        {gitTag: 'v2.0.0', version: '2.0.0', gitHead: '111'},
+        {gitTag: 'v2.1.0', version: '2.1.0', gitHead: '222'},
+        {gitTag: 'v2.1.1', version: '2.1.1', gitHead: '333'},
+        {gitTag: 'v1.0.0', version: '1.0.0', gitHead: '444'},
+        {gitTag: 'v1.1.0', version: '1.1.0', gitHead: '555'},
+      ],
+    },
+    branches: [{name: '2.x', channel: '2.x'}, {name: 'master'}],
+    options: {tagFormat: `v\${version}`},
+  });
+
+  t.deepEqual(result, [
+    {
+      lastRelease: {version: '2.0.0', channel: '2.x', gitTag: 'v2.0.0@2.x', name: 'v2.0.0', gitHead: '111'},
+      currentRelease: {
+        type: 'minor',
+        version: '2.1.0',
+        channel: undefined,
+        gitTag: 'v2.1.0',
+        name: 'v2.1.0',
+        gitHead: '222',
+      },
+      nextRelease: {
+        type: 'minor',
+        version: '2.1.0',
+        channel: '2.x',
+        gitTag: 'v2.1.0@2.x',
+        name: 'v2.1.0',
+        gitHead: '222',
+      },
+    },
+    {
+      lastRelease: {version: '2.1.0', channel: undefined, gitTag: 'v2.1.0', name: 'v2.1.0', gitHead: '222'},
+      currentRelease: {
+        type: 'patch',
+        version: '2.1.1',
+        channel: undefined,
+        gitTag: 'v2.1.1',
+        name: 'v2.1.1',
+        gitHead: '333',
+      },
+      nextRelease: {
+        type: 'patch',
+        version: '2.1.1',
+        channel: '2.x',
+        gitTag: 'v2.1.1@2.x',
+        name: 'v2.1.1',
+        gitHead: '333',
+      },
+    },
+  ]);
+});
+
+test('Return versions merged between release branches', t => {
+  const result = getReleasesToAdd({
+    branch: {
+      name: 'master',
+      tags: [
+        {gitTag: 'v1.0.0', version: '1.0.0', gitHead: '111'},
+        {gitTag: 'v1.0.0@next', version: '1.0.0', channel: 'next', gitHead: '111'},
+        {gitTag: 'v1.1.0@next', version: '1.1.0', channel: 'next', gitHead: '222'},
+        {gitTag: 'v2.0.0@next-major', version: '2.0.0', channel: 'next-major', gitHead: '333'},
+      ],
+    },
+    branches: [{name: 'master'}, {name: 'next', channel: 'next'}, {name: 'next-major', channel: 'next-major'}],
+    options: {tagFormat: `v\${version}`},
+  });
+
+  t.deepEqual(result, [
+    {
+      lastRelease: {version: '1.0.0', channel: undefined, gitTag: 'v1.0.0', name: 'v1.0.0', gitHead: '111'},
+      currentRelease: {
+        type: 'minor',
+        version: '1.1.0',
+        channel: 'next',
+        gitTag: 'v1.1.0@next',
+        name: 'v1.1.0',
+        gitHead: '222',
+      },
+      nextRelease: {
+        type: 'minor',
+        version: '1.1.0',
+        channel: undefined,
+        gitTag: 'v1.1.0',
+        name: 'v1.1.0',
+        gitHead: '222',
+      },
+    },
+    {
+      lastRelease: {version: '1.1.0', gitTag: 'v1.1.0@next', name: 'v1.1.0', gitHead: '222', channel: 'next'},
+      currentRelease: {
+        type: 'major',
+        version: '2.0.0',
+        channel: 'next-major',
+        gitTag: 'v2.0.0@next-major',
+        name: 'v2.0.0',
+        gitHead: '333',
+      },
+      nextRelease: {
+        type: 'major',
+        version: '2.0.0',
+        channel: undefined,
+        gitTag: 'v2.0.0',
+        name: 'v2.0.0',
+        gitHead: '333',
+      },
+    },
+  ]);
+});
+
+test('Return releases sorted by ascending order', t => {
+  const result = getReleasesToAdd({
+    branch: {
+      name: 'master',
+      tags: [
+        {gitTag: 'v2.0.0@next-major', version: '2.0.0', channel: 'next-major', gitHead: '333'},
+        {gitTag: 'v1.1.0@next', version: '1.1.0', channel: 'next', gitHead: '222'},
+        {gitTag: 'v1.0.0', version: '1.0.0', gitHead: '111'},
+        {gitTag: 'v1.0.0@next', version: '1.0.0', channel: 'next', gitHead: '111'},
+      ],
+    },
+    branches: [{name: 'master'}, {name: 'next', channel: 'next'}, {name: 'next-major', channel: 'next-major'}],
+    options: {tagFormat: `v\${version}`},
+  });
+
+  t.deepEqual(result, [
+    {
+      lastRelease: {version: '1.0.0', channel: undefined, gitTag: 'v1.0.0', name: 'v1.0.0', gitHead: '111'},
+      currentRelease: {
+        type: 'minor',
+        version: '1.1.0',
+        channel: 'next',
+        gitTag: 'v1.1.0@next',
+        name: 'v1.1.0',
+        gitHead: '222',
+      },
+      nextRelease: {
+        type: 'minor',
+        version: '1.1.0',
+        channel: undefined,
+        gitTag: 'v1.1.0',
+        name: 'v1.1.0',
+        gitHead: '222',
+      },
+    },
+    {
+      lastRelease: {version: '1.1.0', gitTag: 'v1.1.0@next', name: 'v1.1.0', gitHead: '222', channel: 'next'},
+      currentRelease: {
+        type: 'major',
+        version: '2.0.0',
+        channel: 'next-major',
+        gitTag: 'v2.0.0@next-major',
+        name: 'v2.0.0',
+        gitHead: '333',
+      },
+      nextRelease: {
+        type: 'major',
+        version: '2.0.0',
+        channel: undefined,
+        gitTag: 'v2.0.0',
+        name: 'v2.0.0',
+        gitHead: '333',
+      },
+    },
+  ]);
+});
+
+test('No lastRelease', t => {
+  const result = getReleasesToAdd({
+    branch: {name: 'master', tags: [{gitTag: 'v1.0.0@next', version: '1.0.0', channel: 'next', gitHead: '111'}]},
+    branches: [{name: 'master'}, {name: 'next', channel: 'next'}],
+    options: {tagFormat: `v\${version}`},
+  });
+
+  t.deepEqual(result, [
+    {
+      lastRelease: {},
+      currentRelease: {
+        type: 'major',
+        version: '1.0.0',
+        channel: 'next',
+        gitTag: 'v1.0.0@next',
+        name: 'v1.0.0',
+        gitHead: '111',
+      },
+      nextRelease: {
+        type: 'major',
+        version: '1.0.0',
+        channel: undefined,
+        gitTag: 'v1.0.0',
+        name: 'v1.0.0',
+        gitHead: '111',
+      },
+    },
+  ]);
+});
+
+test('Ignore pre-release versions', t => {
+  const result = getReleasesToAdd({
+    branch: {
+      name: 'master',
+      tags: [
+        {gitTag: 'v1.0.0', version: '1.0.0', gitHead: '111'},
+        {gitTag: 'v1.0.0@next', version: '1.0.0', channel: 'next', gitHead: '111'},
+        {gitTag: 'v1.1.0@next', version: '1.1.0', channel: 'next', gitHead: '222'},
+        {gitTag: 'v2.0.0-alpha.1@alpha', version: '2.0.0', channel: 'alpha', gitHead: '333'},
+      ],
+    },
+    branches: [
+      {name: 'master'},
+      {name: 'next', channel: 'next'},
+      {name: 'alpha', type: 'prerelease', channel: 'alpha'},
+    ],
+    options: {tagFormat: `v\${version}`},
+  });
+
+  t.deepEqual(result, [
+    {
+      lastRelease: {version: '1.0.0', channel: undefined, gitTag: 'v1.0.0', name: 'v1.0.0', gitHead: '111'},
+      currentRelease: {
+        type: 'minor',
+        version: '1.1.0',
+        channel: 'next',
+        gitTag: 'v1.1.0@next',
+        name: 'v1.1.0',
+        gitHead: '222',
+      },
+      nextRelease: {
+        type: 'minor',
+        version: '1.1.0',
+        channel: undefined,
+        gitTag: 'v1.1.0',
+        name: 'v1.1.0',
+        gitHead: '222',
+      },
+    },
+  ]);
+});
+
+test('Exclude versions merged from release to maintenance branch if they have the same "channel"', t => {
+  const result = getReleasesToAdd({
+    branch: {
+      name: '2.x',
+      channel: 'latest',
+      type: 'maintenance',
+      mergeRange: '>=2.0.0 <3.0.0',
+      tags: [
+        {gitTag: 'v2.0.0', version: '2.0.0', gitHead: '111'},
+        {gitTag: 'v2.0.0', version: '2.0.0', gitHead: '111'},
+        {gitTag: 'v2.1.0', version: '2.1.0', gitHead: '222'},
+        {gitTag: 'v2.1.1', version: '2.1.1', gitHead: '333'},
+        {gitTag: 'v1.0.0', version: '1.0.0', gitHead: '444'},
+        {gitTag: 'v1.1.0', version: '1.1.0', gitHead: '555'},
+      ],
+    },
+    branches: [{name: '2.x', channel: 'latest'}, {name: 'master', channel: 'latest'}],
+    options: {tagFormat: `v\${version}`},
+  });
+
+  t.deepEqual(result, []);
+});
+
+test('Exclude versions merged between release branches if they have the same "channel"', t => {
+  const result = getReleasesToAdd({
+    branch: {
+      name: 'master',
+      channel: 'latest',
+      tags: [
+        {gitTag: 'v1.0.0', channel: 'latest', version: '1.0.0', gitHead: '111'},
+        {gitTag: 'v1.1.0', channel: 'latest', version: '1.1.0', gitHead: '222'},
+        {gitTag: 'v2.0.0', channel: 'latest', version: '2.0.0', gitHead: '333'},
+      ],
+    },
+    branches: [
+      {name: 'master', channel: 'latest'},
+      {name: 'next', channel: 'latest'},
+      {name: 'next-major', channel: 'latest'},
+    ],
+    options: {tagFormat: `v\${version}`},
+  });
+
+  t.deepEqual(result, []);
+});
+
+test('Exclude versions merged between release branches if they all have "channel" set to "false"', t => {
+  const result = getReleasesToAdd({
+    branch: {
+      name: 'master',
+      channel: false,
+      tags: [
+        {gitTag: 'v1.0.0', version: '1.0.0', gitHead: '111'},
+        {gitTag: 'v1.1.0', version: '1.1.0', gitHead: '222'},
+        {gitTag: 'v2.0.0', version: '2.0.0', gitHead: '333'},
+      ],
+    },
+    branches: [{name: 'master', channel: false}, {name: 'next', channel: false}, {name: 'next-major', channel: false}],
+    options: {tagFormat: `v\${version}`},
+  });
+
+  t.deepEqual(result, []);
+});
@@ -3,12 +3,14 @@ import tempy from 'tempy';
 import {
  getTagHead,
  isRefInHistory,
+  isRefExists,
  fetch,
  getGitHead,
  repoUrl,
  tag,
  push,
  getTags,
+  getBranches,
  isGitRepo,
  verifyTagName,
  isBranchUpToDate,
@@ -56,7 +58,7 @@ test('Unshallow and fetch repository', async t => {
  // Verify the shallow clone contains only one commit
  t.is((await gitGetCommits(undefined, {cwd})).length, 1);

-  await fetch(repositoryUrl, {cwd});
+  await fetch(repositoryUrl, 'master', {cwd});

  // Verify the shallow clone contains all the commits
  t.is((await gitGetCommits(undefined, {cwd})).length, 2);
@@ -64,10 +66,15 @@ test('Unshallow and fetch repository', async t => {

 test('Do not throw error when unshallow a complete repository', async t => {
  // Create a git repository, set the current working directory at the root of the repo
-  const {cwd, repositoryUrl} = await gitRepo();
-  // Add commits to the master branch
+  const {cwd, repositoryUrl} = await gitRepo(true);
  await gitCommits(['First'], {cwd});
-  await t.notThrowsAsync(fetch(repositoryUrl, {cwd}));
+  await gitPush(repositoryUrl, 'master', {cwd});
+  await gitCheckout('second-branch', true, {cwd});
+  await gitCommits(['Second'], {cwd});
+  await gitPush(repositoryUrl, 'second-branch', {cwd});
+
+  await t.notThrowsAsync(fetch(repositoryUrl, 'master', {cwd}));
+  await t.notThrowsAsync(fetch(repositoryUrl, 'second-branch', {cwd}));
 });

 test('Fetch all tags on a detached head repository', async t => {
@@ -82,7 +89,7 @@ test('Fetch all tags on a detached head repository', async t => {
  await gitPush(repositoryUrl, 'master', {cwd});
  cwd = await gitDetachedHead(repositoryUrl, commit.hash);

-  await fetch(repositoryUrl, {cwd});
+  await fetch(repositoryUrl, 'master', {cwd});

  t.deepEqual((await getTags({cwd})).sort(), ['v1.0.0', 'v1.0.1', 'v1.1.0'].sort());
 });
@@ -98,9 +105,39 @@ test('Verify if the commit `sha` is in the direct history of the current branch'
  const otherCommits = await gitCommits(['Second'], {cwd});
  await gitCheckout('master', false, {cwd});

-  t.true(await isRefInHistory(commits[0].hash, {cwd}));
-  t.falsy(await isRefInHistory(otherCommits[0].hash, {cwd}));
-  await t.throwsAsync(isRefInHistory('non-existant-sha', {cwd}));
+  t.true(await isRefInHistory(commits[0].hash, 'master', false, {cwd}));
+  t.falsy(await isRefInHistory(otherCommits[0].hash, 'master', false, {cwd}));
+  t.falsy(await isRefInHistory(otherCommits[0].hash, 'missing-branch', false, {cwd}));
+  await t.throwsAsync(isRefInHistory('non-existant-sha', 'master', false, {cwd}));
+});
+
+test('Verify if a branch exists', async t => {
+  // Create a git repository, set the current working directory at the root of the repo
+  const {cwd} = await gitRepo();
+  // Add commits to the master branch
+  await gitCommits(['First'], {cwd});
+  // Create the new branch 'other-branch' from master
+  await gitCheckout('other-branch', true, {cwd});
+  // Add commits to the 'other-branch' branch
+  await gitCommits(['Second'], {cwd});
+
+  t.true(await isRefExists('master', {cwd}));
+  t.true(await isRefExists('other-branch', {cwd}));
+  t.falsy(await isRefExists('next', {cwd}));
+});
+
+test('Get all branches', async t => {
+  const {cwd, repositoryUrl} = await gitRepo(true);
+  await gitCommits(['First'], {cwd});
+  await gitPush(repositoryUrl, 'master', {cwd});
+  await gitCheckout('second-branch', true, {cwd});
+  await gitCommits(['Second'], {cwd});
+  await gitPush(repositoryUrl, 'second-branch', {cwd});
+  await gitCheckout('third-branch', true, {cwd});
+  await gitCommits(['Third'], {cwd});
+  await gitPush(repositoryUrl, 'third-branch', {cwd});
+
+  t.deepEqual((await getBranches(repositoryUrl, {cwd})).sort(), ['master', 'second-branch', 'third-branch'].sort());
 });

 test('Get the commit sha for a given tag or falsy if the tag does not exists', async t => {
@@ -146,7 +183,7 @@ test('Add tag on head commit', async t => {
  const {cwd} = await gitRepo();
  const commits = await gitCommits(['Test commit'], {cwd});

-  await tag('tag_name', {cwd});
+  await tag({gitTag: 'tag_name', gitHead: 'HEAD', version: '1.0.0'}, {cwd});

  await t.is(await gitCommitTag(commits[0].hash, {cwd}), 'tag_name');
 });
@@ -156,13 +193,13 @@ test('Push tag to remote repository', async t => {
  const {cwd, repositoryUrl} = await gitRepo(true);
  const commits = await gitCommits(['Test commit'], {cwd});

-  await tag('tag_name', {cwd});
+  await tag({gitTag: 'tag_name', gitHead: 'HEAD', version: '1.0.0'}, {cwd});
  await push(repositoryUrl, {cwd});

  t.is(await gitRemoteTagHead(repositoryUrl, 'tag_name', {cwd}), commits[0].hash);
 });

-test('Push tag to remote repository with remote branch ahaed', async t => {
+test('Push tag to remote repository with remote branch ahead', async t => {
  const {cwd, repositoryUrl} = await gitRepo(true);
  const commits = await gitCommits(['First'], {cwd});
  await gitPush(repositoryUrl, 'master', {cwd});
@@ -170,7 +207,7 @@ test('Push tag to remote repository with remote branch ahaed', async t => {
  await gitCommits(['Second'], {cwd: tmpRepo});
  await gitPush('origin', 'master', {cwd: tmpRepo});

-  await tag('tag_name', {cwd});
+  await tag({gitTag: 'tag_name', gitHead: 'HEAD', version: '1.0.0'}, {cwd});
  await push(repositoryUrl, {cwd});

  t.is(await gitRemoteTagHead(repositoryUrl, 'tag_name', {cwd}), commits[0].hash);
@@ -214,7 +251,7 @@ test('Return "true" if repository is up to date', async t => {
  await gitCommits(['First'], {cwd});
  await gitPush(repositoryUrl, 'master', {cwd});

-  t.true(await isBranchUpToDate('master', {cwd}));
+  t.true(await isBranchUpToDate(repositoryUrl, 'master', {cwd}));
 });

 test('Return falsy if repository is not up to date', async t => {
@@ -223,13 +260,13 @@ test('Return falsy if repository is not up to date', async t => {
  await gitCommits(['Second'], {cwd});
  await gitPush(repositoryUrl, 'master', {cwd});

-  t.true(await isBranchUpToDate('master', {cwd}));
+  t.true(await isBranchUpToDate(repositoryUrl, 'master', {cwd}));

  const tmpRepo = await gitShallowClone(repositoryUrl);
  await gitCommits(['Third'], {cwd: tmpRepo});
  await gitPush('origin', 'master', {cwd: tmpRepo});

-  t.falsy(await isBranchUpToDate('master', {cwd}));
+  t.falsy(await isBranchUpToDate(repositoryUrl, 'master', {cwd}));
 });

 test('Return "true" if local repository is ahead', async t => {
@@ -238,5 +275,5 @@ test('Return "true" if local repository is ahead', async t => {
  await gitPush(repositoryUrl, 'master', {cwd});
  await gitCommits(['Second'], {cwd});

-  t.true(await isBranchUpToDate('master', {cwd}));
+  t.true(await isBranchUpToDate(repositoryUrl, 'master', {cwd}));
 });
@@ -1,7 +1,7 @@
 import tempy from 'tempy';
 import execa from 'execa';
 import fileUrl from 'file-url';
-import pReduce from 'p-reduce';
+import pEachSeries from 'p-each-series';
 import gitLogParser from 'git-log-parser';
 import getStream from 'get-stream';

@@ -69,7 +69,7 @@ export async function initBareRepo(repositoryUrl, branch = 'master') {
 * @returns {Array<Commit>} The created commits, in reverse order (to match `git log` order).
 */
 export async function gitCommits(messages, execaOpts) {
-  await pReduce(messages, (_, message) =>
+  await pEachSeries(messages, message =>
    execa.stdout('git', ['commit', '-m', message, '--allow-empty', '--no-gpg-sign'], execaOpts)
  );
  return (await gitGetCommits(undefined, execaOpts)).slice(0, messages.length);
@@ -195,7 +195,7 @@ export function gitTagHead(tagName, execaOpts) {
 * @return {String} The sha of the commit associated with `tagName` on the remote repository.
 */
 export async function gitRemoteTagHead(repositoryUrl, tagName, execaOpts) {
-  return (await execa.stdout('git', ['ls-remote', '--tags', repositoryUrl, tagName], execaOpts))
+  return (await execa.stdout('git', ['ls-remote', repositoryUrl, `${tagName}^{}`], execaOpts))
    .split('\n')
    .filter(tag => Boolean(tag))
    .map(tag => tag.match(/^(\S+)/)[1])[0];
@@ -225,3 +225,46 @@ export function gitCommitTag(gitHead, execaOpts) {
 export async function gitPush(repositoryUrl = 'origin', branch = 'master', execaOpts) {
  await execa('git', ['push', '--tags', repositoryUrl, `HEAD:${branch}`], execaOpts);
 }
+
+/**
+ * Merge a branch into the current one with `git merge`.
+ *
+ * @param {String} ref The ref to merge.
+ * @param {Object} [execaOpts] Options to pass to `execa`.
+ */
+export async function merge(ref, execaOpts) {
+  await execa('git', ['merge', '--no-ff', ref], execaOpts);
+}
+
+/**
+ * Merge a branch into the current one with `git merge --ff`.
+ *
+ * @param {String} ref The ref to merge.
+ * @param {Object} [execaOpts] Options to pass to `execa`.
+ */
+export async function mergeFf(ref, execaOpts) {
+  await execa('git', ['merge', '--ff', ref], execaOpts);
+}
+
+/**
+ * Merge a branch into the current one with `git rebase`.
+ *
+ * @param {String} ref The ref to merge.
+ * @param {Object} [execaOpts] Options to pass to `execa`.
+ */
+export async function rebase(ref, execaOpts) {
+  await execa('git', ['rebase', ref], execaOpts);
+}
+
+export async function changeAuthor(sha, execaOpts) {
+  await execa(
+    'git',
+    [
+      'filter-branch',
+      '-f',
+      '--env-filter',
+      `if [[ "$GIT_COMMIT" = "${sha}" ]]; then export GIT_COMMITTER_NAME="New Author" GIT_COMMITTER_EMAIL="author@test.com"; fi`,
+    ],
+    execaOpts
+  );
+}
@@ -0,0 +1,5 @@
+import execa from 'execa';
+
+export async function npmView(packageName, env) {
+  return JSON.parse(await execa.stdout('npm', ['view', packageName, '--json'], {env}));
+}
@@ -5,8 +5,19 @@ import {escapeRegExp} from 'lodash';
 import {writeJson, readJson} from 'fs-extra';
 import execa from 'execa';
 import {WritableStreamBuffer} from 'stream-buffers';
+import delay from 'delay';
 import {SECRET_REPLACEMENT} from '../lib/definitions/constants';
-import {gitHead, gitTagHead, gitRepo, gitCommits, gitRemoteTagHead, gitPush} from './helpers/git-utils';
+import {
+  gitHead,
+  gitTagHead,
+  gitRepo,
+  gitCommits,
+  gitRemoteTagHead,
+  gitPush,
+  gitCheckout,
+  merge,
+} from './helpers/git-utils';
+import {npmView} from './helpers/npm-utils';
 import gitbox from './helpers/gitbox';
 import mockServer from './helpers/mockserver';
 import npmRegistry from './helpers/npm-registry';
@@ -58,7 +69,7 @@ test('Release patch, minor and major versions', async t => {
    version: '0.0.0-dev',
    repository: {url: repositoryUrl},
    publishConfig: {registry: npmRegistry.url},
-    release: {success: false, fail: false},
+    release: {branches: ['master', 'next'], success: false, fail: false},
  });
  // Create a npm-shrinkwrap.json file
  await execa('npm', ['shrinkwrap'], {env: testEnv, cwd});
@@ -86,7 +97,7 @@ test('Release patch, minor and major versions', async t => {
  let createReleaseMock = await mockServer.mock(
    `/repos/${owner}/${packageName}/releases`,
    {
-      body: {tag_name: `v${version}`, target_commitish: 'master', name: `v${version}`},
+      body: {tag_name: `v${version}`, name: `v${version}`},
      headers: [{name: 'Authorization', values: [`token ${env.GH_TOKEN}`]}],
    },
    {body: {html_url: `release-url/${version}`}}
@@ -105,15 +116,14 @@ test('Release patch, minor and major versions', async t => {
  t.is((await readJson(path.resolve(cwd, 'npm-shrinkwrap.json'))).version, version);

  // Retrieve the published package from the registry and check version and gitHead
-  let [, releasedVersion, releasedGitHead] = /^version = '(.+)'\s+gitHead = '(.+)'$/.exec(
-    (await execa('npm', ['show', packageName, 'version', 'gitHead'], {env: testEnv, cwd})).stdout
-  );
+  let {
+    'dist-tags': {latest: releasedVersion},
+  } = await npmView(packageName, testEnv);
  let head = await gitHead({cwd});
  t.is(releasedVersion, version);
-  t.is(releasedGitHead, head);
  t.is(await gitTagHead(`v${version}`, {cwd}), head);
  t.is(await gitRemoteTagHead(authUrl, `v${version}`, {cwd}), head);
-  t.log(`+ released ${releasedVersion} with head ${releasedGitHead}`);
+  t.log(`+ released ${releasedVersion}`);

  await mockServer.verify(verifyMock);
  await mockServer.verify(createReleaseMock);
@@ -128,7 +138,7 @@ test('Release patch, minor and major versions', async t => {
  createReleaseMock = await mockServer.mock(
    `/repos/${owner}/${packageName}/releases`,
    {
-      body: {tag_name: `v${version}`, target_commitish: 'master', name: `v${version}`},
+      body: {tag_name: `v${version}`, name: `v${version}`},
      headers: [{name: 'Authorization', values: [`token ${env.GH_TOKEN}`]}],
    },
    {body: {html_url: `release-url/${version}`}}
@@ -147,15 +157,14 @@ test('Release patch, minor and major versions', async t => {
  t.is((await readJson(path.resolve(cwd, 'npm-shrinkwrap.json'))).version, version);

  // Retrieve the published package from the registry and check version and gitHead
-  [, releasedVersion, releasedGitHead] = /^version = '(.+)'\s+gitHead = '(.+)'$/.exec(
-    (await execa('npm', ['show', packageName, 'version', 'gitHead'], {env: testEnv, cwd})).stdout
-  );
+  ({
+    'dist-tags': {latest: releasedVersion},
+  } = await npmView(packageName, testEnv));
  head = await gitHead({cwd});
  t.is(releasedVersion, version);
-  t.is(releasedGitHead, head);
  t.is(await gitTagHead(`v${version}`, {cwd}), head);
  t.is(await gitRemoteTagHead(authUrl, `v${version}`, {cwd}), head);
-  t.log(`+ released ${releasedVersion} with head ${releasedGitHead}`);
+  t.log(`+ released ${releasedVersion}`);

  await mockServer.verify(verifyMock);
  await mockServer.verify(createReleaseMock);
@@ -170,7 +179,7 @@ test('Release patch, minor and major versions', async t => {
  createReleaseMock = await mockServer.mock(
    `/repos/${owner}/${packageName}/releases`,
    {
-      body: {tag_name: `v${version}`, target_commitish: 'master', name: `v${version}`},
+      body: {tag_name: `v${version}`, name: `v${version}`},
      headers: [{name: 'Authorization', values: [`token ${env.GH_TOKEN}`]}],
    },
    {body: {html_url: `release-url/${version}`}}
@@ -189,20 +198,19 @@ test('Release patch, minor and major versions', async t => {
  t.is((await readJson(path.resolve(cwd, 'npm-shrinkwrap.json'))).version, version);

  // Retrieve the published package from the registry and check version and gitHead
-  [, releasedVersion, releasedGitHead] = /^version = '(.+)'\s+gitHead = '(.+)'$/.exec(
-    (await execa('npm', ['show', packageName, 'version', 'gitHead'], {env: testEnv, cwd})).stdout
-  );
+  ({
+    'dist-tags': {latest: releasedVersion},
+  } = await npmView(packageName, testEnv));
  head = await gitHead({cwd});
  t.is(releasedVersion, version);
-  t.is(releasedGitHead, head);
  t.is(await gitTagHead(`v${version}`, {cwd}), head);
  t.is(await gitRemoteTagHead(authUrl, `v${version}`, {cwd}), head);
-  t.log(`+ released ${releasedVersion} with head ${releasedGitHead}`);
+  t.log(`+ released ${releasedVersion}`);

  await mockServer.verify(verifyMock);
  await mockServer.verify(createReleaseMock);

-  /* Major release */
+  /* Major release on next */
  version = '2.0.0';
  verifyMock = await mockServer.mock(
    `/repos/${owner}/${packageName}`,
@@ -212,16 +220,18 @@ test('Release patch, minor and major versions', async t => {
  createReleaseMock = await mockServer.mock(
    `/repos/${owner}/${packageName}/releases`,
    {
-      body: {tag_name: `v${version}`, target_commitish: 'master', name: `v${version}`},
+      body: {tag_name: `v${version}@next`, name: `v${version}`},
      headers: [{name: 'Authorization', values: [`token ${env.GH_TOKEN}`]}],
    },
    {body: {html_url: `release-url/${version}`}}
  );

-  t.log('Commit a breaking change');
+  t.log('Commit a breaking change on next');
+  await gitCheckout('next', true, {cwd});
+  await gitPush('origin', 'next', {cwd});
  await gitCommits(['feat: foo\n\n BREAKING CHANGE: bar'], {cwd});
  t.log('$ semantic-release');
-  ({stdout, code} = await execa(cli, [], {env, cwd}));
+  ({stdout, code} = await execa(cli, [], {env: {...env, TRAVIS_BRANCH: 'next'}, cwd}));
  t.regex(stdout, new RegExp(`Published GitHub release: release-url/${version}`));
  t.regex(stdout, new RegExp(`Publishing version ${version} to npm registry`));
  t.is(code, 0);
@@ -231,18 +241,67 @@ test('Release patch, minor and major versions', async t => {
  t.is((await readJson(path.resolve(cwd, 'npm-shrinkwrap.json'))).version, version);

  // Retrieve the published package from the registry and check version and gitHead
-  [, releasedVersion, releasedGitHead] = /^version = '(.+)'\s+gitHead = '(.+)'$/.exec(
-    (await execa('npm', ['show', packageName, 'version', 'gitHead'], {env: testEnv, cwd})).stdout
-  );
+  ({
+    'dist-tags': {next: releasedVersion},
+  } = await npmView(packageName, testEnv));
  head = await gitHead({cwd});
  t.is(releasedVersion, version);
-  t.is(releasedGitHead, head);
-  t.is(await gitTagHead(`v${version}`, {cwd}), head);
-  t.is(await gitRemoteTagHead(authUrl, `v${version}`, {cwd}), head);
-  t.log(`+ released ${releasedVersion} with head ${releasedGitHead}`);
+  t.is(await gitTagHead(`v${version}@next`, {cwd}), head);
+  t.is(await gitRemoteTagHead(authUrl, `v${version}@next`, {cwd}), head);
+  t.log(`+ released ${releasedVersion} on @next`);

  await mockServer.verify(verifyMock);
  await mockServer.verify(createReleaseMock);
+
+  /* Merge next into master */
+  version = '2.0.0';
+  const releaseId = 1;
+  verifyMock = await mockServer.mock(
+    `/repos/${owner}/${packageName}`,
+    {headers: [{name: 'Authorization', values: [`token ${env.GH_TOKEN}`]}]},
+    {body: {permissions: {push: true}}, method: 'GET'}
+  );
+  const getReleaseMock = await mockServer.mock(
+    `/repos/${owner}/${packageName}/releases/tags/v2.0.0@next`,
+    {headers: [{name: 'Authorization', values: [`token ${env.GH_TOKEN}`]}]},
+    {body: {id: releaseId}, method: 'GET'}
+  );
+  const updateReleaseMock = await mockServer.mock(
+    `/repos/${owner}/${packageName}/releases/${releaseId}`,
+    {
+      body: {tag_name: `v${version}`, name: `v${version}`, prerelease: false},
+      headers: [{name: 'Authorization', values: [`token ${env.GH_TOKEN}`]}],
+    },
+    {body: {html_url: `release-url/${version}`}, method: 'PATCH'}
+  );
+
+  t.log('Merge next into master');
+  await gitCheckout('master', false, {cwd});
+  await merge('next', {cwd});
+  await gitPush('origin', 'master', {cwd});
+  t.log('$ semantic-release');
+  ({stdout, code} = await execa(cli, [], {env, cwd}));
+  t.regex(stdout, new RegExp(`Updated GitHub release: release-url/${version}`));
+  t.regex(stdout, new RegExp(`Adding version ${version} to npm registry on dist-tag latest`));
+  t.is(code, 0);
+
+  // Wait for 3s as the change of dist-tag takes time to be reflected in the registry
+  await delay(3000);
+  // Retrieve the published package from the registry and check version and gitHead
+  ({
+    'dist-tags': {latest: releasedVersion},
+  } = await npmView(packageName, testEnv));
+  t.is(releasedVersion, version);
+  t.is(await gitTagHead(`v${version}`, {cwd}), await gitTagHead(`v${version}@next`, {cwd}));
+  t.is(
+    await gitRemoteTagHead(authUrl, `v${version}`, {cwd}),
+    await gitRemoteTagHead(authUrl, `v${version}@next`, {cwd})
+  );
+  t.log(`+ added ${releasedVersion}`);
+
+  await mockServer.verify(verifyMock);
+  await mockServer.verify(getReleaseMock);
+  await mockServer.verify(updateReleaseMock);
 });

 test('Exit with 1 if a plugin is not found', async t => {
@@ -366,7 +425,7 @@ test('Allow local releases with "noCi" option', async t => {
  const createReleaseMock = await mockServer.mock(
    `/repos/${owner}/${packageName}/releases`,
    {
-      body: {tag_name: `v${version}`, target_commitish: 'master', name: `v${version}`},
+      body: {tag_name: `v${version}`, name: `v${version}`},
      headers: [{name: 'Authorization', values: [`token ${env.GH_TOKEN}`]}],
    },
    {body: {html_url: `release-url/${version}`}}
@@ -384,9 +443,7 @@ test('Allow local releases with "noCi" option', async t => {
  t.is((await readJson(path.resolve(cwd, 'package.json'))).version, version);

  // Retrieve the published package from the registry and check version and gitHead
-  const [, releasedVersion, releasedGitHead] = /^version = '(.+)'\s+gitHead = '(.+)'$/.exec(
-    (await execa('npm', ['show', packageName, 'version', 'gitHead'], {env: testEnv, cwd})).stdout
-  );
+  const {version: releasedVersion, gitHead: releasedGitHead} = await npmView(packageName, testEnv);

  const head = await gitHead({cwd});
  t.is(releasedVersion, version);
@@ -439,9 +496,7 @@ test('Pass options via CLI arguments', async t => {
  t.is((await readJson(path.resolve(cwd, 'package.json'))).version, version);

  // Retrieve the published package from the registry and check version and gitHead
-  const [, releasedVersion, releasedGitHead] = /^version = '(.+)'\s+gitHead = '(.+)'$/.exec(
-    (await execa('npm', ['show', packageName, 'version', 'gitHead'], {env: testEnv, cwd})).stdout
-  );
+  const {version: releasedVersion, gitHead: releasedGitHead} = await npmView(packageName, testEnv);
  const head = await gitHead({cwd});
  t.is(releasedVersion, version);
  t.is(releasedGitHead, head);
@@ -482,7 +537,7 @@ test('Run via JS API', async t => {
  const createReleaseMock = await mockServer.mock(
    `/repos/${owner}/${packageName}/releases`,
    {
-      body: {tag_name: `v${version}`, target_commitish: 'master', name: `v${version}`},
+      body: {tag_name: `v${version}`, name: `v${version}`},
      headers: [{name: 'Authorization', values: [`token ${env.GH_TOKEN}`]}],
    },
    {body: {html_url: `release-url/${version}`}}
@@ -497,9 +552,7 @@ test('Run via JS API', async t => {
  t.is((await readJson(path.resolve(cwd, 'package.json'))).version, version);

  // Retrieve the published package from the registry and check version and gitHead
-  const [, releasedVersion, releasedGitHead] = /^version = '(.+)'\s+gitHead = '(.+)'$/.exec(
-    (await execa('npm', ['show', packageName, 'version', 'gitHead'], {env: testEnv, cwd})).stdout
-  );
+  const {version: releasedVersion, gitHead: releasedGitHead} = await npmView(packageName, testEnv);
  const head = await gitHead({cwd});
  t.is(releasedVersion, version);
  t.is(releasedGitHead, head);
@@ -152,6 +152,24 @@ test('Wrap "publish" plugin in a function that validate the output of the plugin
  t.regex(error.details, /2/);
 });

+test('Wrap "addChannel" plugin in a function that validate the output of the plugin', async t => {
+  const addChannel = stub().resolves(2);
+  const plugin = normalize(
+    {cwd, options: {}, stderr: t.context.stderr, logger: t.context.logger},
+    'addChannel',
+    addChannel,
+    {}
+  );
+
+  const error = await t.throwsAsync(plugin({options: {}}));
+
+  t.is(error.code, 'EADDCHANNELOUTPUT');
+  t.is(error.name, 'SemanticReleaseError');
+  t.truthy(error.message);
+  t.truthy(error.details);
+  t.regex(error.details, /2/);
+});
+
 test('Plugin is called with "pluginConfig" (with object definition) and input', async t => {
  const pluginFunction = stub().resolves();
  const pluginConf = {path: pluginFunction, conf: 'confValue'};
@@ -255,6 +273,6 @@ test('Throws an error if the plugin is not found', t => {
    Error
  );

-  t.is(error.message, "Cannot find module 'non-existing-path'");
+  t.regex(error.message, /Cannot find module 'non-existing-path'/);
  t.is(error.code, 'MODULE_NOT_FOUND');
 });
@@ -0,0 +1,180 @@
+import test from 'ava';
+import AggregateError from 'aggregate-error';
+import {
+  extractErrors,
+  tagsToVersions,
+  isMajorRange,
+  isMaintenanceRange,
+  getUpperBound,
+  getLowerBound,
+  highest,
+  lowest,
+  getLatestVersion,
+  getEarliestVersion,
+  getFirstVersion,
+  getRange,
+  makeTag,
+} from '../lib/utils';
+
+test('extractErrors', t => {
+  const errors = [new Error('Error 1'), new Error('Error 2')];
+
+  t.deepEqual(extractErrors(new AggregateError(errors)), errors);
+  t.deepEqual(extractErrors(errors[0]), [errors[0]]);
+});
+
+test('tagsToVersions', t => {
+  t.deepEqual(tagsToVersions([{version: '1.0.0'}, {version: '1.1.0'}, {version: '1.2.0'}]), [
+    '1.0.0',
+    '1.1.0',
+    '1.2.0',
+  ]);
+});
+
+test('isMajorRange', t => {
+  t.false(isMajorRange('1.1.x'));
+  t.false(isMajorRange('1.11.x'));
+  t.false(isMajorRange('11.1.x'));
+  t.false(isMajorRange('11.11.x'));
+  t.false(isMajorRange('1.1.X'));
+  t.false(isMajorRange('1.1.0'));
+
+  t.true(isMajorRange('1.x.x'));
+  t.true(isMajorRange('11.x.x'));
+  t.true(isMajorRange('1.X.X'));
+  t.true(isMajorRange('1.x'));
+  t.true(isMajorRange('11.x'));
+  t.true(isMajorRange('1.X'));
+});
+
+test('isMaintenanceRange', t => {
+  t.true(isMaintenanceRange('1.1.x'));
+  t.true(isMaintenanceRange('11.1.x'));
+  t.true(isMaintenanceRange('11.11.x'));
+  t.true(isMaintenanceRange('1.11.x'));
+  t.true(isMaintenanceRange('1.x.x'));
+  t.true(isMaintenanceRange('11.x.x'));
+  t.true(isMaintenanceRange('1.x'));
+  t.true(isMaintenanceRange('11.x'));
+  t.true(isMaintenanceRange('1.1.X'));
+  t.true(isMaintenanceRange('1.X.X'));
+  t.true(isMaintenanceRange('1.X'));
+
+  t.false(isMaintenanceRange('1.1.0'));
+  t.false(isMaintenanceRange('11.1.0'));
+  t.false(isMaintenanceRange('1.11.0'));
+  t.false(isMaintenanceRange('11.11.0'));
+  t.false(isMaintenanceRange('~1.0.0'));
+  t.false(isMaintenanceRange('^1.0.0'));
+});
+
+test('getUpperBound', t => {
+  t.is(getUpperBound('1.x.x'), '2.0.0');
+  t.is(getUpperBound('1.X.X'), '2.0.0');
+  t.is(getUpperBound('10.x.x'), '11.0.0');
+  t.is(getUpperBound('1.x'), '2.0.0');
+  t.is(getUpperBound('10.x'), '11.0.0');
+  t.is(getUpperBound('1.0.x'), '1.1.0');
+  t.is(getUpperBound('10.0.x'), '10.1.0');
+  t.is(getUpperBound('10.10.x'), '10.11.0');
+  t.is(getUpperBound('1.0.0'), '1.0.0');
+  t.is(getUpperBound('10.0.0'), '10.0.0');
+
+  t.is(getUpperBound('foo'), undefined);
+});
+
+test('getLowerBound', t => {
+  t.is(getLowerBound('1.x.x'), '1.0.0');
+  t.is(getLowerBound('1.X.X'), '1.0.0');
+  t.is(getLowerBound('10.x.x'), '10.0.0');
+  t.is(getLowerBound('1.x'), '1.0.0');
+  t.is(getLowerBound('10.x'), '10.0.0');
+  t.is(getLowerBound('1.0.x'), '1.0.0');
+  t.is(getLowerBound('10.0.x'), '10.0.0');
+  t.is(getLowerBound('1.10.x'), '1.10.0');
+  t.is(getLowerBound('1.0.0'), '1.0.0');
+  t.is(getLowerBound('10.0.0'), '10.0.0');
+
+  t.is(getLowerBound('foo'), undefined);
+});
+
+test('highest', t => {
+  t.is(highest('1.0.0', '2.0.0'), '2.0.0');
+  t.is(highest('1.1.1', '1.1.0'), '1.1.1');
+  t.is(highest(null, '1.0.0'), '1.0.0');
+  t.is(highest('1.0.0'), '1.0.0');
+  t.is(highest(), undefined);
+});
+
+test('lowest', t => {
+  t.is(lowest('1.0.0', '2.0.0'), '1.0.0');
+  t.is(lowest('1.1.1', '1.1.0'), '1.1.0');
+  t.is(lowest(null, '1.0.0'), '1.0.0');
+  t.is(lowest(), undefined);
+});
+
+test.serial('getLatestVersion', t => {
+  t.is(getLatestVersion(['1.2.3-alpha.3', '1.2.0', '1.0.1', '1.0.0-alpha.1']), '1.2.0');
+  t.is(getLatestVersion(['1.2.3-alpha.3', '1.2.3-alpha.2']), undefined);
+
+  t.is(getLatestVersion(['1.2.3-alpha.3', '1.2.0', '1.0.1', '1.0.0-alpha.1']), '1.2.0');
+  t.is(getLatestVersion(['1.2.3-alpha.3', '1.2.3-alpha.2']), undefined);
+
+  t.is(getLatestVersion(['1.2.3-alpha.3', '1.2.0', '1.0.1', '1.0.0-alpha.1'], {withPrerelease: true}), '1.2.3-alpha.3');
+  t.is(getLatestVersion(['1.2.3-alpha.3', '1.2.3-alpha.2'], {withPrerelease: true}), '1.2.3-alpha.3');
+
+  t.is(getLatestVersion([]), undefined);
+});
+
+test.serial('getEarliestVersion', t => {
+  t.is(getEarliestVersion(['1.2.3-alpha.3', '1.2.0', '1.0.0', '1.0.1-alpha.1']), '1.0.0');
+  t.is(getEarliestVersion(['1.2.3-alpha.3', '1.2.3-alpha.2']), undefined);
+
+  t.is(getEarliestVersion(['1.2.3-alpha.3', '1.2.0', '1.0.0', '1.0.1-alpha.1']), '1.0.0');
+  t.is(getEarliestVersion(['1.2.3-alpha.3', '1.2.3-alpha.2']), undefined);
+
+  t.is(
+    getEarliestVersion(['1.2.3-alpha.3', '1.2.0', '1.0.1', '1.0.0-alpha.1'], {withPrerelease: true}),
+    '1.0.0-alpha.1'
+  );
+  t.is(getEarliestVersion(['1.2.3-alpha.3', '1.2.3-alpha.2'], {withPrerelease: true}), '1.2.3-alpha.2');
+
+  t.is(getEarliestVersion([]), undefined);
+});
+
+test('getFirstVersion', t => {
+  t.is(getFirstVersion(['1.2.0', '1.0.0', '1.3.0', '1.1.0', '1.4.0'], []), '1.0.0');
+  t.is(
+    getFirstVersion(
+      ['1.2.0', '1.0.0', '1.3.0', '1.1.0', '1.4.0'],
+      [
+        {name: 'master', tags: [{version: '1.0.0'}, {version: '1.1.0'}]},
+        {name: 'next', tags: [{version: '1.0.0'}, {version: '1.1.0'}, {version: '1.2.0'}]},
+      ]
+    ),
+    '1.3.0'
+  );
+  t.is(
+    getFirstVersion(
+      ['1.2.0', '1.0.0', '1.1.0'],
+      [
+        {name: 'master', tags: [{version: '1.0.0'}, {version: '1.1.0'}]},
+        {name: 'next', tags: [{version: '1.0.0'}, {version: '1.1.0'}, {version: '1.2.0'}]},
+      ]
+    ),
+    undefined
+  );
+});
+
+test('getRange', t => {
+  t.is(getRange('1.0.0', '1.1.0'), '>=1.0.0 <1.1.0');
+  t.is(getRange('1.0.0'), '>=1.0.0');
+});
+
+test('makeTag', t => {
+  t.is(makeTag(`v\${version}`, '1.0.0'), 'v1.0.0');
+  t.is(makeTag(`v\${version}`, '1.0.0', false), 'v1.0.0');
+  t.is(makeTag(`v\${version}`, '1.0.0', null), 'v1.0.0');
+  t.is(makeTag(`v\${version}`, '1.0.0', 'next'), 'v1.0.0@next');
+  t.is(makeTag(`v\${version}@test`, '1.0.0', 'next'), 'v1.0.0@next@test');
+});
@@ -5,7 +5,7 @@ import {gitRepo} from './helpers/git-utils';

 test('Throw a AggregateError', async t => {
  const {cwd} = await gitRepo();
-  const options = {};
+  const options = {branches: [{name: 'master'}, {name: ''}]};

  const errors = [...(await t.throwsAsync(verify({cwd, options})))];

@@ -21,11 +21,15 @@ test('Throw a AggregateError', async t => {
  t.is(errors[2].code, 'ETAGNOVERSION');
  t.truthy(errors[2].message);
  t.truthy(errors[2].details);
+  t.is(errors[3].name, 'SemanticReleaseError');
+  t.is(errors[3].code, 'EINVALIDBRANCH');
+  t.truthy(errors[3].message);
+  t.truthy(errors[3].details);
 });

 test('Throw a SemanticReleaseError if does not run on a git repository', async t => {
  const cwd = tempy.directory();
-  const options = {};
+  const options = {branches: []};

  const errors = [...(await t.throwsAsync(verify({cwd, options})))];

@@ -37,7 +41,7 @@ test('Throw a SemanticReleaseError if does not run on a git repository', async t

 test('Throw a SemanticReleaseError if the "tagFormat" is not valid', async t => {
  const {cwd, repositoryUrl} = await gitRepo(true);
-  const options = {repositoryUrl, tagFormat: `?\${version}`};
+  const options = {repositoryUrl, tagFormat: `?\${version}`, branches: []};

  const errors = [...(await t.throwsAsync(verify({cwd, options})))];

@@ -49,7 +53,7 @@ test('Throw a SemanticReleaseError if the "tagFormat" is not valid', async t =>

 test('Throw a SemanticReleaseError if the "tagFormat" does not contains the "version" variable', async t => {
  const {cwd, repositoryUrl} = await gitRepo(true);
-  const options = {repositoryUrl, tagFormat: 'test'};
+  const options = {repositoryUrl, tagFormat: 'test', branches: []};

  const errors = [...(await t.throwsAsync(verify({cwd, options})))];

@@ -61,7 +65,7 @@ test('Throw a SemanticReleaseError if the "tagFormat" does not contains the "ver

 test('Throw a SemanticReleaseError if the "tagFormat" contains multiple "version" variables', async t => {
  const {cwd, repositoryUrl} = await gitRepo(true);
-  const options = {repositoryUrl, tagFormat: `\${version}v\${version}`};
+  const options = {repositoryUrl, tagFormat: `\${version}v\${version}`, branches: []};

  const errors = [...(await t.throwsAsync(verify({cwd, options})))];

@@ -71,9 +75,43 @@ test('Throw a SemanticReleaseError if the "tagFormat" contains multiple "version
  t.truthy(errors[0].details);
 });

+test('Throw a SemanticReleaseError for each invalid branch', async t => {
+  const {cwd, repositoryUrl} = await gitRepo(true);
+  const options = {
+    repositoryUrl,
+    tagFormat: `v\${version}`,
+    branches: [{name: ''}, {name: '  '}, {name: 1}, {}, {name: ''}, 1, 'master'],
+  };
+
+  const errors = [...(await t.throwsAsync(verify({cwd, options})))];
+
+  t.is(errors[0].name, 'SemanticReleaseError');
+  t.is(errors[0].code, 'EINVALIDBRANCH');
+  t.truthy(errors[0].message);
+  t.truthy(errors[0].details);
+  t.is(errors[1].name, 'SemanticReleaseError');
+  t.is(errors[1].code, 'EINVALIDBRANCH');
+  t.truthy(errors[1].message);
+  t.truthy(errors[1].details);
+  t.is(errors[2].name, 'SemanticReleaseError');
+  t.is(errors[2].code, 'EINVALIDBRANCH');
+  t.truthy(errors[2].message);
+  t.truthy(errors[2].details);
+  t.is(errors[3].name, 'SemanticReleaseError');
+  t.is(errors[3].code, 'EINVALIDBRANCH');
+  t.truthy(errors[3].message);
+  t.truthy(errors[3].details);
+  t.is(errors[4].code, 'EINVALIDBRANCH');
+  t.truthy(errors[4].message);
+  t.truthy(errors[4].details);
+  t.is(errors[5].code, 'EINVALIDBRANCH');
+  t.truthy(errors[5].message);
+  t.truthy(errors[5].details);
+});
+
 test('Return "true" if all verification pass', async t => {
  const {cwd, repositoryUrl} = await gitRepo(true);
-  const options = {repositoryUrl, tagFormat: `v\${version}`};
+  const options = {repositoryUrl, tagFormat: `v\${version}`, branches: [{name: 'master'}]};

  await t.notThrowsAsync(verify({cwd, options}));
 });
Author	SHA1	Message	Date
Scott WillekeandGregor Martynus	3f0a37944d	fix(package): update @semantic-release/github back to a build from the beta branch * Only the beta channel that is compatible with semantic-release v16 * 5.4.0-beta.1 worked, but subsequently v5.4.3 was released from master but didn't include the changes from the beta branch and 5.4.0-beta.1.	2019-09-12 12:30:03 -07:00
Scott WillekeandGregor Martynus	cb2c506d8b	fix: prefix git auth url with "x-access-token:" when run in a GitHub Action	2019-09-12 12:30:03 -07:00
Pierre Vanduynslager	3e4bb40990	style: fix prettier style	2019-06-07 16:03:30 -04:00
Pierre Vanduynslager	4d581fc140	feat: create annotated tags	2019-06-07 16:03:30 -04:00
Pierre Vanduynslager	9948a74347	fix: revert to the correct refspec in fetch function	2019-06-06 12:54:21 -04:00
Pierre Vanduynslager	113157f42a	test: fix parsing of test repo URL on Travis in unit tests	2019-06-05 17:18:17 -04:00
Pierre Vanduynslager	d4f28abd47	test: fix parsing of `MODULE_NOT_FOUND` errors message in unit tests	2019-06-05 17:18:17 -04:00
jmodjeski75andGregor Martynus	3610422959	fix(repositoryUrl): on beta repositoryUrl needs auth for pre-release flows (#1186 )	2019-06-05 11:33:54 -07:00
Ryan KennedyandGregor Martynus	37bcc9e515	fix: Add helpful detail to `ERELEASEBRANCHES` error message (#1188 )	2019-05-23 12:21:17 -07:00
Pierre Vanduynslager	8576f49e54	test: update test to new sinon version	2019-05-09 10:38:02 -04:00
Pierre Vanduynslager	b60fef83cb	chore(package): update @semantic-release/github to version 5.4.0-beta.1	2019-05-09 10:38:02 -04:00
Pierre Vanduynslager	a0229962ce	fix: fix maintenance branch regex	2019-05-09 10:38:02 -04:00
greenkeeper[bot]andPierre Vanduynslager	d10268a8fa	chore(package): update xo to version 0.24.0	2019-01-30 19:54:29 -05:00
Kevin LluchandPierre Vanduynslager	9d310c958b	docs: add semantic-release-ado to community plugins	2019-01-30 19:54:29 -05:00
Austin Cawley-EdwardsandPierre Vanduynslager	d7299395d5	docs: fix typo in CircleCI recipe	2019-01-30 19:54:29 -05:00
David AghassiandPierre Vanduynslager	2977462c5b	docs: cleaned up wording and typos in docs	2019-01-30 19:54:29 -05:00
David AghassiandPierre Vanduynslager	7f90b7b691	docs: corrected typos in jsdocs	2019-01-30 19:54:29 -05:00
greenkeeper[bot]andPierre Vanduynslager	d0891bf037	fix(package): update marked to version 0.6.0	2019-01-30 19:54:29 -05:00
Pierre Vanduynslager	990e85f069	fix: ignore lasst release only if pre-release on the same channel as current branch	2019-01-14 13:05:48 -05:00
Pierre Vanduynslager	0457a074e7	fix: correctly determine next pre-release version	2019-01-07 18:22:41 -05:00
Pierre Vanduynslager	1d8c35d889	docs: update FAQ regarding initial release version	2018-12-31 03:35:32 -05:00
Pierre Vanduynslager	0d91027e9f	docs: update release triggering section in README	2018-12-31 03:35:32 -05:00
Pierre Vanduynslager	2144f2064f	docs: add missing recipes link in README	2018-12-31 03:35:32 -05:00
Pierre Vanduynslager	d55fda3306	fix(pacjage): update `@semantic-release/github` and `@semantic-release/npm`	2018-12-27 15:42:15 -05:00
greenkeeper[bot]andPierre Vanduynslager	ba00e16f43	chore(package): update ava to version 1.0.1	2018-12-27 15:04:57 -05:00
greenkeeper[bot]andPierre Vanduynslager	5d6fd7c1cd	fix(package): update aggregate-error to version 2.0.0	2018-12-27 15:04:57 -05:00
Pierre Vanduynslager	f96c660c1b	fix: harmonize parameters passed to `getError`	2018-12-18 18:02:02 -05:00
Pierre Vanduynslager	4aad9cd490	fix: do not call `addChannel`for 2 merged branches configured with the same channel	2018-12-18 02:18:19 -05:00
Pierre Vanduynslager	390e966341	fix(package): update @semantic-release/npm to version 5.2.0-beta.3	2018-12-17 15:23:04 -05:00
Pierre Vanduynslager	c1c96a87a3	fix(package): update @semantic-release/github to version 5.3.0-beta.5	2018-12-17 15:23:04 -05:00
Pierre Vanduynslager	725780bf0a	fix(package): update @semantic-release/commit-analyzer to version 7.0.0-beta.2	2018-12-17 15:23:04 -05:00
Pierre Vanduynslager	9a023b4088	fix: call `success` plugin only once for releases added to a channel	2018-12-17 15:23:04 -05:00
Pierre Vanduynslager	c22ae17a9b	fix: on maintenance branch add to channel only version >= to start range	2018-12-17 15:23:04 -05:00
Pierre Vanduynslager	162b4b9e3b	fix: remove confusing logs when searching for releases to add to a channel	2018-12-17 15:23:04 -05:00
Pierre Vanduynslager	9a04e64fab	fix: fix range regexp to handle version with multiple digits	2018-12-16 19:05:08 -05:00
Pierre Vanduynslager	89663d3fcf	fix: correctly handle skipped releases	2018-12-16 16:15:48 -05:00
Pierre Vanduynslager	e1b418d0b5	build: fix Travis maintenance branch regexp	2018-12-14 23:40:59 -05:00
Pierre Vanduynslager	9a30f3542c	fix(package): update `@semantic-release/github`	2018-12-14 22:29:26 -05:00
Pierre Vanduynslager	d6731b9b27	fix(package): update `@semantic-release/npm` and `@semantic-release/github`	2018-12-14 19:26:25 -05:00
Pierre Vanduynslager	e1c7269cb3	feat: allow `addChannel` plugins to return `false` in order to signify no release was done	2018-12-14 18:37:02 -05:00
Pierre Vanduynslager	aa48514f85	refactor: remove unnecessary `default` of `addChannel` plugin	2018-12-14 18:37:02 -05:00
Pierre Vanduynslager	47484f5eb2	feat: allow `publish` plugins to return `false` in order to signify no release was done	2018-12-14 16:46:32 -05:00
Pierre Vanduynslager	2aa65ad668	docs: fix broken link in CircleCI recipe	2018-12-14 16:45:48 -05:00
Pierre Vanduynslager	0bfc7a974e	docs: remove mentions of `travis-deploy-once`	2018-12-14 16:45:48 -05:00
greenkeeper[bot]andPierre Vanduynslager	28c21fbc93	chore(package): update p-retry to version 3.0.0	2018-12-14 16:45:48 -05:00
Pierre Vanduynslager	52ca0b391c	fix: fix branch type regexp to handle version with multiple digits	2018-12-13 15:32:07 -05:00
Gregor Martynus	5d99e02254	docs(workflow-configuration): typo	2018-12-13 09:28:49 -08:00
Pierre Vanduynslager	d51254f465	docs: mention that `debug` option is CLI only	2018-12-11 21:18:39 -05:00
Pierre Vanduynslager	2faff2637f	fix: allow to set `ci` option via API and config file	2018-12-11 21:18:39 -05:00
Pierre Vanduynslager	635406c4c8	docs: switch to spectrum.chat	2018-12-11 21:18:39 -05:00
Pierre Vanduynslager	708bca3842	docs: syntax fixes in plugins list	2018-12-11 21:18:39 -05:00
Pierre Vanduynslager	862ffbe512	docs: add `@semantic-release/apm` to plugins list	2018-12-11 21:18:39 -05:00
Evan SirokyandPierre Vanduynslager	1f6d8e3ee1	docs: add maven-semantic-release to list of community plugins	2018-12-11 21:18:39 -05:00
Pierre Vanduynslager	b874017458	chore(package): update nyc and sinon	2018-12-11 21:18:39 -05:00
Pierre Vanduynslager	a31dd9c873	test: delete unused test helper file	2018-12-11 21:18:39 -05:00
Pierre Vanduynslager	687fea28f1	docs: new `branches` option in JS API example	2018-12-11 20:15:07 -05:00
Pierre Vanduynslager	968b9968a1	fix: remove unnecessary `branch` parameter from `push` function	2018-11-29 20:44:31 -05:00
Pierre Vanduynslager	b729183b4a	fix: fetch all release branches on CI	2018-11-29 20:03:51 -05:00
Pierre Vanduynslager	e63e753cf0	feat(package): update @semantic-release/commit-analyzer to version 7.0.0 BREAKING CHANGE: Regexp are not supported anymore for property matching in the `releaseRules` option. Regex are replaced by [globs](https://github.com/micromatch/micromatch#matching-features). For example `/core-./` should be changed to `'core-'`.	2018-11-29 14:13:03 -05:00
Pierre Vanduynslager	7b4052470b	feat: support multiple branches and distribution channels - Allow to configure multiple branches to release from - Allow to define a distribution channel associated with each branch - Manage the availability on distribution channels based on git merges - Support regular releases, maintenance releases and pre-releases - Add the `addChannel` plugin step to make an existing release available on a different distribution channel BREAKING CHANGE: the `branch` option has been removed in favor of `branches` The new `branches` option expect either an Array or a single branch definition. To migrate your configuration: - If you want to publish package from multiple branches, please the configuration documentation - If you use the default configuration and want to publish only from `master`: nothing to change - If you use the `branch` configuration and want to publish only from one branch: replace `branch` by `branches` (`"branch": "my-release-branch"` => `"branches": "my-release-branch"`)	2018-11-29 14:13:03 -05:00