fix: remove unnecessary branch parameter from push function

This bug affects only plugins defined with the `plugins` option and wrapped in an Array to add a configuration

.travis.yml

@@ -7,11 +7,11 @@ node_js:
   - 10
   - 8
 
-# Trigger a push build on caribou and greenkeeper branches + PRs build on every branches
+# Trigger a push build on master 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:
-    - caribou
+    - master
     - /^greenkeeper.*$/
 
 # Retry install on fail to avoid failing a build on network/disk/external errors

README.md

@@ -5,10 +5,10 @@
     <img alt="Gitter" src="https://badges.gitter.im/semantic-release/semantic-release.svg">
   </a>
   <a href="https://travis-ci.org/semantic-release/semantic-release">
-    <img alt="Travis" src="https://img.shields.io/travis/semantic-release/semantic-release/caribou.svg">
+    <img alt="Travis" src="https://img.shields.io/travis/semantic-release/semantic-release/master.svg">
   </a>
   <a href="https://codecov.io/gh/semantic-release/semantic-release">
-    <img alt="Codecov" src="https://img.shields.io/codecov/c/github/semantic-release/semantic-release/caribou.svg">
+    <img alt="Codecov" src="https://img.shields.io/codecov/c/github/semantic-release/semantic-release/master.svg">
   </a>
   <a href="https://greenkeeper.io">
     <img alt="Greenkeeper" src="https://badges.greenkeeper.io/semantic-release/semantic-release.svg">

bin/semantic-release.js

@@ -16,7 +16,7 @@ if (!semver.satisfies(process.version, pkg.engines.node)) {
   console.error(
     `[semantic-release]: node version ${pkg.engines.node} is required. Found ${process.version}.
 
-See https://github.com/semantic-release/semantic-release/blob/caribou/docs/support/node-version.md for more details and solutions.`
+See https://github.com/semantic-release/semantic-release/blob/master/docs/support/node-version.md for more details and solutions.`
   );
   process.exit(1);
 }

codecov.yml

@@ -1,2 +0,0 @@
-codecov:
-  branch: caribou

docs/extending/plugins-list.md

@@ -35,7 +35,7 @@
 
 ## Community plugins
 
-[Open a Pull Request](https://github.com/semantic-release/semantic-release/blob/caribou/CONTRIBUTING.md#submitting-a-pull-request) to add your plugin to the list.
+[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-docker](https://github.com/felixfbecker/semantic-release-docker)
   - `verifyConditions`: Verify that all needed configuration is present and login to the Docker registry.

docs/usage/configuration.md

@@ -1,11 +1,11 @@
 # Configuration
 
-**semantic-release** configuration consist of:
+**semantic-release** configuration consists of:
 - Git repository options ([URL](#repositoryurl), [release branch](#branch) and [tag format](#tagformat))
 - [plugins](#plugins) definition
 - run mode ([debug](#debug), [dry run](#dryrun) and [local (no CI)](#ci))
 
-All those options can be configured directly or by extending a [shareable configuration](shareable-configurations.md).
+All of these options can be configured directly or by extending a [shareable configuration](shareable-configurations.md).
 
 Additionally, metadata of Git tags generated by **semantic-release** can be customized via standard [Git environment variables](#git-environment-variables).
 
@@ -16,7 +16,7 @@ Additionally, metadata of Git tags generated by **semantic-release** can be cust
 - A `release.config.js` file that exports an object
 - A `release` key in the project's `package.json` file
 
-Alternatively some options can be set via CLI arguments.
+Alternatively, some options can be set via CLI arguments.
 
 The following three examples are the same.
 
@@ -131,7 +131,7 @@ Type: `Boolean`<br>
 Default: `false`<br>
 CLI argument: `--debug`
 
-Output debugging information. It can also be enabled by setting the `DEBUG` environment variable to `semantic-release:*`.
+Output debugging information. This can also be enabled by setting the `DEBUG` environment variable to `semantic-release:*`.
 
 ## Git environment variables
 
@@ -144,7 +144,7 @@ Output debugging information. It can also be enabled by setting the `DEBUG` envi
 
 ## 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 have 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 branch](#branch) 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.
 

index.js

@@ -107,7 +107,7 @@ async function run(context, plugins) {
   } else {
     // Create the tag before calling the publish plugins as some require the tag to exists
     await tag(nextRelease.gitTag, {cwd, env});
-    await push(options.repositoryUrl, options.branch, {cwd, env});
+    await push(options.repositoryUrl, {cwd, env});
     logger.success(`Created tag ${nextRelease.gitTag}`);
   }
 

lib/definitions/errors.js

@@ -6,7 +6,7 @@ const {RELEASE_TYPE} = require('./constants');
 
 const homepage = url.format({...url.parse(pkg.homepage), hash: null});
 const stringify = obj => (isString(obj) ? obj : inspect(obj, {breakLength: Infinity, depth: 2, maxArrayLength: 5}));
-const linkify = file => `${homepage}/blob/caribou/${file}`;
+const linkify = file => `${homepage}/blob/master/${file}`;
 
 module.exports = {
   ENOGITREPO: ({cwd}) => ({

lib/get-config.js

@@ -6,6 +6,7 @@ const debug = require('debug')('semantic-release:config');
 const {repoUrl} = require('./git');
 const PLUGINS_DEFINITIONS = require('./definitions/plugins');
 const plugins = require('./plugins');
+const {validatePlugin, parseConfig} = require('./plugins/utils');
 
 const CONFIG_NAME = 'release';
 const CONFIG_FILES = [
@@ -37,17 +38,21 @@ module.exports = async (context, opts) => {
 
         // For each plugin defined in a shareable config, save in `pluginsPath` the extendable config path,
         // so those plugin will be loaded relatively to the config file
-        Object.entries(extendsOpts).reduce((pluginsPath, [option, value]) => {
-          if (PLUGINS_DEFINITIONS[option] || option === 'plugins') {
-            castArray(value)
-              .filter(plugin => isString(plugin) || (isPlainObject(plugin) && isString(plugin.path)))
-              .map(plugin => (isString(plugin) ? plugin : plugin.path))
-              .forEach(plugin => {
-                pluginsPath[plugin] = extendPath;
-              });
-          }
-          return pluginsPath;
-        }, pluginsPath);
+        Object.entries(extendsOpts)
+          .filter(([, value]) => Boolean(value))
+          .reduce((pluginsPath, [option, value]) => {
+            castArray(value).forEach(plugin => {
+              if (option === 'plugins' && validatePlugin(plugin)) {
+                pluginsPath[parseConfig(plugin)[0]] = extendPath;
+              } else if (
+                PLUGINS_DEFINITIONS[option] &&
+                (isString(plugin) || (isPlainObject(plugin) && isString(plugin.path)))
+              ) {
+                pluginsPath[isString(plugin) ? plugin : plugin.path] = extendPath;
+              }
+            });
+            return pluginsPath;
+          }, pluginsPath);
 
         return {...result, ...extendsOpts};
       }, {}),

lib/git.js

@@ -143,12 +143,11 @@ async function tag(tagName, execaOpts) {
  * Push to the remote repository.
  *
  * @param {String} repositoryUrl The remote repository URL.
- * @param {String} branch The branch to push.
  * @param {Object} [execaOpts] Options to pass to `execa`.
  *
  * @throws {Error} if the push failed.
  */
-async function push(repositoryUrl, branch, execaOpts) {
+async function push(repositoryUrl, execaOpts) {
   await execa('git', ['push', '--tags', repositoryUrl], execaOpts);
 }
 

package.json

@@ -112,9 +112,6 @@
   "publishConfig": {
     "tag": "next"
   },
-  "release": {
-    "branch": "caribou"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/semantic-release/semantic-release.git"

test/get-config.test.js

@@ -212,7 +212,7 @@ test('Read configuration from file path in "extends"', async t => {
     branch: 'test_branch',
     repositoryUrl: 'https://host.null/owner/module.git',
     tagFormat: `v\${version}`,
-    plugins: false,
+    plugins: ['plugin-1', ['plugin-2', {plugin2Opt: 'value'}]],
   };
   // Create package.json and shareable.json in repository root
   await outputJson(path.resolve(cwd, 'package.json'), {release: pkgOptions});
@@ -227,6 +227,8 @@ test('Read configuration from file path in "extends"', async t => {
   t.deepEqual(t.context.plugins.args[0][1], {
     analyzeCommits: './shareable.json',
     generateNotes: './shareable.json',
+    'plugin-1': './shareable.json',
+    'plugin-2': './shareable.json',
   });
 });
 

test/git.test.js

@@ -157,7 +157,7 @@ test('Push tag to remote repository', async t => {
   const commits = await gitCommits(['Test commit'], {cwd});
 
   await tag('tag_name', {cwd});
-  await push(repositoryUrl, 'master', {cwd});
+  await push(repositoryUrl, {cwd});
 
   t.is(await gitRemoteTagHead(repositoryUrl, 'tag_name', {cwd}), commits[0].hash);
 });
@@ -171,7 +171,7 @@ test('Push tag to remote repository with remote branch ahaed', async t => {
   await gitPush('origin', 'master', {cwd: tmpRepo});
 
   await tag('tag_name', {cwd});
-  await push(repositoryUrl, 'master', {cwd});
+  await push(repositoryUrl, {cwd});
 
   t.is(await gitRemoteTagHead(repositoryUrl, 'tag_name', {cwd}), commits[0].hash);
 });