Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature-freeze master #3149

Merged
merged 2 commits into from
Mar 13, 2018
Merged

Feature-freeze master #3149

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fab3664
Feature-freeze master
Hypnosphi Mar 4, 2018
0aec277
Merge branch 'master' into feature-freeze
danielduan Mar 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions dangerfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,37 @@
import { fail, danger } from 'danger';
import { flatten, intersection, isEmpty, includes } from 'lodash';
import { flatten, intersection, isEmpty } from 'lodash';

const pkg = require('./package.json'); // eslint-disable-line import/newline-after-import
const prLogConfig = pkg['pr-log'];

const Versions = {
PATCH: 'PATCH',
MINOR: 'MINOR',
MAJOR: 'MAJOR',
};

const branchVersion = Versions.PATCH;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This variable should be configured per branch. Maybe this should be a field in package.json, I'm not sure


const checkRequiredLabels = labels => {
const forbiddenLabels = flatten([
'do not merge',
'in progress',
branchVersion !== Versions.MAJOR ? 'BREAKING CHANGE' : [],
branchVersion === Versions.PATCH ? 'feature request' : [],
]);

const requiredLabels = flatten([
prLogConfig.skipLabels || [],
Object.keys(prLogConfig.validLabels || {}),
]);

if (includes(labels, 'do not merge')) {
fail('PR is marked with "do not merge" label.');
const blockingLabels = intersection(forbiddenLabels, labels);
if (!isEmpty(blockingLabels)) {
fail(
`PR is marked with ${blockingLabels.map(label => `"${label}"`).join(', ')} label${
blockingLabels.length > 1 ? 's' : ''
}.`
);
}

const foundLabels = intersection(requiredLabels, labels);
Expand Down