Skip to content

ci(mergify): upgrade configuration to current format#2237

Merged
mrodm merged 2 commits intomainfrom
mergify/configuration-deprecated-update
Nov 22, 2024
Merged

ci(mergify): upgrade configuration to current format#2237
mrodm merged 2 commits intomainfrom
mergify/configuration-deprecated-update

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Nov 20, 2024

No more deprecated fields are being used in your Mergify configuration, this pull request will be closed.

@mrodm mrodm requested a review from a team November 20, 2024 15:59
@mrodm
Copy link
Copy Markdown
Contributor

mrodm commented Nov 20, 2024

@jsoriano I've just updated the rule name and the queue name to be used 94f1a9e
Do you think it is needed to updated anything else ?

@elasticmachine
Copy link
Copy Markdown
Collaborator

💚 Build Succeeded

History

merge_method: squash

pull_request_rules:
- name: automatic approval for Dependabot pull requests
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Well, is the condition of this rule needed now?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Do you mean the automatic approval for Dependabot pull requests pull request rule?
That rule does not have any condition.

The other pull request rule (automatic merge of bot 🤖) has no conditions (empty array), so probably it could be removed the conditions entry. I could push a commit deleting that entry.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Do you mean the automatic approval for Dependabot pull requests pull request rule?
That rule does not have any condition.

Yes, I refer to this one.

It has this condition, right?

    conditions:
      - author~=^dependabot(|-preview)\[bot\]$

Is it needed? Or why was it removed from the other rule and not from here? 🤔

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Ok! I didn't see it because Github didn't show it (it was collapsed) 😅

What I understand is that from the other rule it is removed because it uses as an action to enqueue the PR (and it uses the conditions defined in the queue). In this rule, there is no action to enqueue the PR. This is just to approve the PR.

What I'm wondering now if it is required to add as part of the queue_conditions this #approved-reviews-by one (docs), but it's true that before there was no such a rule:

    queue_conditions:
      - check-success=buildkite/elastic-package
      - check-success=CLA
      - base=main
      - author~=^dependabot(|-preview)\[bot\]$
      - "#approved-reviews-by >= 1"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

What I understand is that from the other rule it is removed because it uses as an action to enqueue the PR (and it uses the conditions defined in the queue). In this rule, there is no action to enqueue the PR. This is just to approve the PR.

Ah ok, this is what I was not understanding.

What I'm wondering now if it is required to add as part of the queue_conditions this #approved-reviews-by one (docs)

I guess we are checking this with the branch protection rules?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I guess we are checking this with the branch protection rules?
Yes, I think so, that rule is there.

@mrodm mrodm merged commit 8cc126a into main Nov 22, 2024
@mrodm mrodm deleted the mergify/configuration-deprecated-update branch November 22, 2024 11:29
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