Skip to content

Commit

Permalink
fix: removePrFromAutomergeQueue
Browse files Browse the repository at this point in the history
  • Loading branch information
christophehurpeau committed Jun 26, 2019
1 parent d079771 commit 35b818a
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion dist/index-node10-dev.cjs.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/index-node10-dev.cjs.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/index-node10.cjs.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/index-node10.cjs.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/context/repoContext.ts
Expand Up @@ -171,7 +171,7 @@ async function initRepoContext<GroupNames extends string>(
},
removePrFromAutomergeQueue: (context, prNumber: number | string): void => {
context.log('merge lock: remove', { prNumber });
if (lockMergePr && String(lockMergePr.number) !== String(prNumber)) {
if (lockMergePr && String(lockMergePr.number) === String(prNumber)) {
lockMergePr = automergeQueue.shift();
context.log('merge lock: next', { lockMergePr });
if (lockMergePr) {
Expand Down

0 comments on commit 35b818a

Please sign in to comment.