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

Attempt to fix Dependabot auto-merge workflow #6975

Merged
merged 3 commits into from
Mar 14, 2022

Conversation

westonruter
Copy link
Member

@westonruter westonruter commented Mar 14, 2022

Summary

This follows up on #6964 (comment).

Based on cli/cli#3660 (comment) (h/t @pierlon) it seems running gh merge --auto it seems that the Dependabot auto-merge workflow may be failing due to one of the preconditions not being met. Namely, the required checks being run in the Build, test & measure workflow. Therefore, this PR makes it so that the Dependabot auto-merge workflow will only be triggered once the aforementioned workflow is completed. Additionally, the approval of the PR is now done after the enabling of auto-merge as apparently enabling auto-merge can't be done if it could be merged already per cli/cli#3660 (reply in thread). So there seems to be two competing conditions, one for the required checks and another for the PR approval. Maybe if auto-merge is enabled in between them then it will succeed.

This PR also amends #6964 to enable auto-merge for minor updates as well as patch updates.

Checklist

  • My code is tested and passes existing tests.
  • My code follows the Engineering Guidelines (updates are often made to the guidelines, check it out periodically).

@westonruter westonruter added the Infrastructure Changes impacting testing infrastructure or build tooling label Mar 14, 2022
@westonruter westonruter added this to the v2.2.2 milestone Mar 14, 2022
@github-actions
Copy link
Contributor

Plugin builds for 3dde1c4 are ready 🛎️!

@westonruter
Copy link
Member Author

Another issue that references this error: dependabot/fetch-metadata#172

@westonruter westonruter merged commit 43e6990 into develop Mar 14, 2022
@westonruter westonruter deleted the update/dependabot-merge-order branch March 14, 2022 22:00
@westonruter
Copy link
Member Author

Welp, it didn't even trigger with this (e.g. #6977)

@westonruter
Copy link
Member Author

westonruter commented Mar 29, 2022

Somehow the auto-merge checkbox was not checked:

image

I've just enabled it. Let's see if that changes things.

h/t dependabot/fetch-metadata#172 (comment)

@westonruter westonruter added the Changelogged Whether the issue/PR has been added to release notes. label Apr 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changelogged Whether the issue/PR has been added to release notes. Infrastructure Changes impacting testing infrastructure or build tooling
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant