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.

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

Add immediate auto-merge fallback #932

Merged
merged 11 commits into from
Apr 4, 2022
Merged

Conversation

0x2b3bfa0
Copy link
Member

@0x2b3bfa0 0x2b3bfa0 commented Apr 3, 2022

Continuation of #903, closes #907 and adds Bitbucket support within the realms of possibility, lacking BCLOUD-14286. Also closes #823 with a pragmatic API compromise.

Tested

  • GitHub
  • GitLab
  • Bitbucket

Warnings

GitHub

warn: Failed to enable auto-merge: Enabling Auto-Merge failed. Please set up branch protection and add "required status checks" for branch 'main': https://github.com/user/repository/settings/branches. Trying to merge immediately...

GitLab

warn: Failed to enable auto-merge: Method Not Allowed. Trying to merge immediately...

Bitbucket

warn: Auto-merge is unsupported by Bitbucket Cloud; see https://jira.atlassian.com/browse/BCLOUD-14286. Trying to merge immediately...

@0x2b3bfa0 0x2b3bfa0 temporarily deployed to internal April 3, 2022 19:35 Inactive
@0x2b3bfa0 0x2b3bfa0 requested a review from a team April 3, 2022 19:35
@0x2b3bfa0 0x2b3bfa0 self-assigned this Apr 3, 2022
@0x2b3bfa0 0x2b3bfa0 added enhancement New feature or request cml-pr Subcommand labels Apr 3, 2022
@0x2b3bfa0 0x2b3bfa0 linked an issue Apr 3, 2022 that may be closed by this pull request
@0x2b3bfa0 0x2b3bfa0 force-pushed the auto-merge-fallback-mode branch from 0365e7c to 556138d Compare April 3, 2022 20:04
@0x2b3bfa0 0x2b3bfa0 temporarily deployed to internal April 3, 2022 20:04 Inactive
@0x2b3bfa0 0x2b3bfa0 marked this pull request as ready for review April 3, 2022 20:07
@0x2b3bfa0 0x2b3bfa0 temporarily deployed to internal April 3, 2022 22:01 Inactive
@0x2b3bfa0 0x2b3bfa0 force-pushed the auto-merge-fallback-mode branch from a6d7dd7 to 2c4da51 Compare April 3, 2022 22:44
@0x2b3bfa0 0x2b3bfa0 temporarily deployed to internal April 3, 2022 22:44 Inactive
@0x2b3bfa0 0x2b3bfa0 force-pushed the auto-merge-fallback-mode branch from 2c4da51 to be39f94 Compare April 4, 2022 02:38
@0x2b3bfa0 0x2b3bfa0 temporarily deployed to internal April 4, 2022 02:38 Inactive
bin/cml/pr.js Outdated Show resolved Hide resolved
src/drivers/bitbucket_cloud.js Outdated Show resolved Hide resolved
src/drivers/github.js Outdated Show resolved Hide resolved
src/drivers/github.js Outdated Show resolved Hide resolved
src/drivers/gitlab.js Outdated Show resolved Hide resolved
src/drivers/gitlab.js Outdated Show resolved Hide resolved
src/drivers/bitbucket_cloud.js Outdated Show resolved Hide resolved
@0x2b3bfa0 0x2b3bfa0 temporarily deployed to internal April 4, 2022 14:49 Inactive
src/drivers/gitlab.js Show resolved Hide resolved
src/drivers/gitlab.js Outdated Show resolved Hide resolved
src/drivers/github.js Outdated Show resolved Hide resolved
@0x2b3bfa0 0x2b3bfa0 temporarily deployed to internal April 4, 2022 14:55 Inactive
src/drivers/gitlab.js Outdated Show resolved Hide resolved
@0x2b3bfa0 0x2b3bfa0 temporarily deployed to internal April 4, 2022 15:05 Inactive
src/drivers/gitlab.js Outdated Show resolved Hide resolved
@0x2b3bfa0 0x2b3bfa0 temporarily deployed to internal April 4, 2022 15:07 Inactive
@0x2b3bfa0 0x2b3bfa0 temporarily deployed to internal April 4, 2022 15:13 Inactive
src/drivers/bitbucket_cloud.js Outdated Show resolved Hide resolved
src/drivers/github.js Outdated Show resolved Hide resolved
@0x2b3bfa0 0x2b3bfa0 temporarily deployed to internal April 4, 2022 15:20 Inactive
@0x2b3bfa0 0x2b3bfa0 temporarily deployed to internal April 4, 2022 15:46 Inactive
@0x2b3bfa0 0x2b3bfa0 temporarily deployed to internal April 4, 2022 16:06 Inactive
@0x2b3bfa0 0x2b3bfa0 temporarily deployed to internal April 4, 2022 16:10 Inactive
@0x2b3bfa0 0x2b3bfa0 temporarily deployed to internal April 4, 2022 16:10 Inactive
@0x2b3bfa0 0x2b3bfa0 temporarily deployed to internal April 4, 2022 16:12 Inactive
@0x2b3bfa0 0x2b3bfa0 requested review from daavoo and DavidGOrtega April 4, 2022 16:14
Copy link
Contributor

@DavidGOrtega DavidGOrtega left a comment

Choose a reason for hiding this comment

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

👍 lgtm

Disclaimer: Not tested! 🙈

@0x2b3bfa0 0x2b3bfa0 merged commit 19fb9ba into master Apr 4, 2022
@0x2b3bfa0 0x2b3bfa0 deleted the auto-merge-fallback-mode branch April 4, 2022 16:30
@0x2b3bfa0

This comment was marked as off-topic.

bin/cml/pr.js Show resolved Hide resolved
src/cml.js Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cml-pr Subcommand enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

pr: --auto-merge fallback cml pr: Add --merge option.
4 participants