fix: allow multiple branches with same channel

lib/get-last-release.js

@@ -1,6 +1,6 @@
 const {isUndefined} = require('lodash');
 const semver = require('semver');
-const {makeTag} = require('./utils');
+const {makeTag, isSameChannel} = require('./utils');
 
 /**
  * Last release.
@@ -28,7 +28,10 @@ const {makeTag} = require('./utils');
  */
 module.exports = ({branch, options: {tagFormat}}, {before} = {}) => {
   const [{version, gitTag, channel} = {}] = branch.tags
-    .filter(tag => (branch.type === 'prerelease' && branch.channel === tag.channel) || !semver.prerelease(tag.version))
+    .filter(
+      tag =>
+        (branch.type === 'prerelease' && isSameChannel(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));
 

lib/get-next-version.js

@@ -1,5 +1,6 @@
 const semver = require('semver');
 const {FIRST_RELEASE, FIRSTPRERELEASE} = require('./definitions/constants');
+const {isSameChannel} = require('./utils');
 
 module.exports = ({branch, nextRelease: {type, channel}, lastRelease, logger}) => {
   let version;
@@ -7,7 +8,7 @@ module.exports = ({branch, nextRelease: {type, channel}, lastRelease, logger}) =
     const {major, minor, patch} = semver.parse(lastRelease.version);
     version =
       branch.type === 'prerelease'
-        ? semver.prerelease(lastRelease.version) && lastRelease.channel === channel
+        ? semver.prerelease(lastRelease.version) && isSameChannel(lastRelease.channel, channel)
           ? semver.inc(lastRelease.version, 'prerelease')
           : `${semver.inc(`${major}.${minor}.${patch}`, type)}-${branch.prerelease}.${FIRSTPRERELEASE}`
         : semver.inc(lastRelease.version, type);

lib/utils.js

@@ -71,6 +71,10 @@ function makeTag(tagFormat, version, channel) {
   return template(tagFormat)({version: `${version}${channel ? `@${channel}` : ''}`});
 }
 
+function isSameChannel(channel, otherChannel) {
+  return channel === otherChannel || (!channel && !otherChannel);
+}
+
 module.exports = {
   extractErrors,
   hideSensitiveValues,
@@ -86,4 +90,5 @@ module.exports = {
   getFirstVersion,
   getRange,
   makeTag,
+  isSameChannel,
 };