Skip to content

fix: don't throw error if required status is not done #389

New issue

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

#

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

Already on GitHub? # to your account

Merged
merged 3 commits into from
Oct 2, 2020
Merged

fix: don't throw error if required status is not done #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d629ef8
fix: don't throw error if required status is not done
shine2lay Sep 29, 2020
c07614d
Merge branch 'master' into #386
shine2lay Oct 2, 2020
3ccae14
add changelog entry
shine2lay Oct 2, 2020
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
1 change: 1 addition & 0 deletions docs/changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
CHANGELOG
=====================================

| October 2, 2020 : Don't throw merge error if required status are are the cause of the error `#389 <https://github.com/mergeability/mergeable/issues/389>`_
| September 24, 2020 : Add ability to delete or replace the labels on an issue `#380 <https://github.com/mergeability/mergeable/issues/380>`_
| September 22, 2020 : Allow support for customizing the scheduler interval via an enviroment variable `MERGEABLE_SCHEDULER_INTERVAL` `#383 <https://github.com/mergeability/mergeable/issues/383>`_
| September 17, 2020 : Add support for `schedule.repository` event for`labels` and `close` actions `#377 <https://github.com/mergeability/mergeable/issues/377>`_
Expand Down
4 changes: 4 additions & 0 deletions lib/actions/merge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ class Merge extends Action {
// skip on known errors
// 405 === Method not allowed , 409 === Conflict
if (err.status === 405 || err.status === 409) {
// if the error is another required status check, just skip
// no easy way to check if all required status are done
if (err.message.includes('Required status check')) return

throw new Error(`Merge failed! error : ${err}`)
} else {
throw err
Expand Down