simon/semantic-release
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: use correct ci branch context (#1521)

Browse Source
This commit is contained in:
Emmanuel Ogbizi 2020-06-25 12:30:12 -04:00 committed by GitHub
parent a4658016d9
commit 0f0c650b41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
index.js
View File

@ -26,7 +26,8 @@ marked.setOptions({renderer: new TerminalRenderer()});
/* eslint complexity: off */ /* eslint complexity: off */
async function run(context, plugins) { async function run(context, plugins) {
const {cwd, env, options, logger} = context; const {cwd, env, options, logger} = context;
const {isCi, branch: ciBranch, isPr} = context.envCi; const {isCi, branch, prBranch, isPr} = context.envCi;
const ciBranch = isPr ? prBranch : branch;
if (!isCi && !options.dryRun && !options.noCi) { if (!isCi && !options.dryRun && !options.noCi) {
logger.warn('This run was not triggered in a known CI environment, running in dry-run mode.'); logger.warn('This run was not triggered in a known CI environment, running in dry-run mode.');

4
test/index.test.js
View File

@ -1258,7 +1258,7 @@ test('Allow local releases with "noCi" option', async (t) => {
const semanticRelease = requireNoCache('..', { const semanticRelease = requireNoCache('..', {
'./lib/get-logger': () => t.context.logger, './lib/get-logger': () => t.context.logger,
'env-ci': () => ({isCi: false, branch: 'master', isPr: true}), 'env-ci': () => ({isCi: false, branch: 'master', isPr: false}),
}); });
t.truthy( t.truthy(
await semanticRelease(options, { await semanticRelease(options, {
@ -1357,7 +1357,7 @@ test('Returns false if triggered by a PR', async (t) => {
const semanticRelease = requireNoCache('..', { const semanticRelease = requireNoCache('..', {
'./lib/get-logger': () => t.context.logger, './lib/get-logger': () => t.context.logger,
'env-ci': () => ({isCi: true, branch: 'master', isPr: true}), 'env-ci': () => ({isCi: true, branch: 'master', prBranch: 'patch-1', isPr: true}),
}); });
t.false( t.false(