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

added update branch before auto-merge #429

Merged
merged 1 commit into from
Aug 13, 2024

Conversation

Bullrich
Copy link
Contributor

Updated auto-merge-bot to version 1.1.0 which has the option to update a branch to be up-to-date before merging.

  • Does not require a CHANGELOG entry

Updated `auto-merge-bot` to version `1.1.0` which has the option to update a branch to be up-to-date before merging.
with:
GITHUB_TOKEN: ${{ steps.merge_token.outputs.token }}
MERGE_METHOD: "SQUASH"
ALLOWLIST: ${{ steps.fellows.outputs.github-handles }}
UPDATE_BEFORE_MERGE: true
Copy link
Contributor

Choose a reason for hiding this comment

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

Otherwise the "automatic merge" it not triggered any way.

Copy link
Contributor

Choose a reason for hiding this comment

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

I mean, it was doing this before already or not?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It wasn't doing this before.

The new version runs the updatePullRequestBranch mutation before enabling auto-merge if this field is enabled.

Apologizes for the delay of the feature, but now it should work as intended and always update the PR before enabling auto-merge.

Copy link
Contributor

Choose a reason for hiding this comment

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

Nice!

@Bullrich
Copy link
Contributor Author

/merge

@fellowship-merge-bot
Copy link
Contributor

Enabled auto-merge in Pull Request

Available commands
  • /merge: Enables auto-merge for Pull Request
  • /merge cancel: Cancels auto-merge for Pull Request
  • /merge help: Shows this menu

For more information see the documentation

@fellowship-merge-bot fellowship-merge-bot bot enabled auto-merge (squash) August 13, 2024 12:58
@fellowship-merge-bot fellowship-merge-bot bot merged commit 9cfa42c into polkadot-fellows:main Aug 13, 2024
52 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants