fix: choose branch instead of prBranch when noCi is true

fix semantic-release#1596
dcneiner · Jul 10, 2020 · 3ced2d5 · 3ced2d5
1 parent b5c9dea
commit 3ced2d5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -27,7 +27,7 @@ marked.setOptions({renderer: new TerminalRenderer()});
 async function run(context, plugins) {
   const {cwd, env, options, logger} = context;
   const {isCi, branch, prBranch, isPr} = context.envCi;
-  const ciBranch = isPr ? prBranch : branch;
+  const ciBranch = isPr && !options.noCi ? prBranch : branch;
 
   if (!isCi && !options.dryRun && !options.noCi) {
     logger.warn('This run was not triggered in a known CI environment, running in dry-run mode.');

diff --git a/test/index.test.js b/test/index.test.js
@@ -1258,7 +1258,7 @@ test('Allow local releases with "noCi" option', async (t) => {
 
   const semanticRelease = requireNoCache('..', {
     './lib/get-logger': () => t.context.logger,
-    'env-ci': () => ({isCi: false, branch: 'master', isPr: false}),
+    'env-ci': () => ({isCi: false, branch: 'master', isPr: true, prBranch: 'refs/pull/4/merge'}),
   });
   t.truthy(
     await semanticRelease(options, {