Skip to content

Commit 370e3e1

Browse files
Luna WeiSaadnajmi
Luna Wei
authored andcommitted
Remove warning against PR for release branch
Summary: Changelog: [Internal] Remove warning about creating a pull request to a release branch We want to support this use case as we want pick requesters to land the cherry-picks themselves and rely on CircleCI automation to test Reviewed By: cortinico Differential Revision: D32780819 fbshipit-source-id: 882625a016653dbf480da33fd499d3718b2b5524
1 parent 877d09a commit 370e3e1

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

bots/dangerfile.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,9 @@ if (!includesChangelog) {
8282
// Fails if the PR is opened against anything other than `master` or `-stable`.
8383
const isMergeRefMaster = danger.github.pr.base.ref === 'master';
8484
const isMergeRefStable = danger.github.pr.base.ref.indexOf('-stable') !== -1;
85-
if (!isMergeRefMaster && isMergeRefStable) {
86-
const title = ':grey_question: Base Branch';
87-
const idea =
88-
'The base branch for this PR is something other than `master`. Are you sure you want to merge these changes into a stable release? If you are interested in backporting updates to an older release, the suggested approach is to land those changes on `master` first and then cherry-pick the commits into the branch for that release. The [Releases Guide](https://github.com/facebook/react-native/blob/master/Releases.md) has more information.';
89-
warn(`${title} - <i>${idea}</i>`);
90-
} else if (!isMergeRefMaster && !isMergeRefStable) {
85+
if (!isMergeRefMaster && !isMergeRefStable) {
9186
const title = ':exclamation: Base Branch';
9287
const idea =
93-
'The base branch for this PR is something other than `master`. [Are you sure you want to target something other than the `master` branch?](https://reactnative.dev/docs/contributing.html#pull-requests)';
88+
'The base branch for this PR is something other than `main` or a `-stable` branch. [Are you sure you want to target something other than the `main` branch?](https://reactnative.dev/docs/contributing#pull-requests)';
9489
fail(`${title} - <i>${idea}</i>`);
9590
}

0 commit comments

Comments
 (0)