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

mergify: add "mergify skip" label #12514

Merged
merged 1 commit into from
Feb 26, 2020
Merged

Conversation

0xc0170
Copy link
Contributor

@0xc0170 0xc0170 commented Feb 26, 2020

Summary of changes

This is useful if we want to drive PR. There are situations when mergify is not ideal,
and we want to overwrite its rules.

I applied the label for some actions that we can overwrite. The use cases here are when status is being checked, as it does not recognize the status properly we need to overwrite it.

Impact of changes

Migration actions required

Documentation


Pull request type

[X] Patch update (Bug fix / Target update / Docs update / Test update / Refactor)
[] Feature update (New feature / Functionality change / New API)
[] Major update (Breaking change E.g. Return code change / API behaviour change)

Test results

[X] No Tests required for this change (E.g docs only update)
[] Covered by existing mbed-os tests (Greentea or Unittest)
[] Tests / results supplied as part of this PR

Reviewers


This is useful if we want to drive PR. There are situations when mergify is not ideal,
and we want to overwrite its rules.

I applied the label for some actions that we can overwrite.
@0xc0170
Copy link
Contributor Author

0xc0170 commented Feb 26, 2020

This should fix situations like this: #12509 (we need to overwrite its rules sometimes)

@@ -120,6 +123,7 @@ pull_request_rules:
conditions:
# Labels
- "label!=do not merge"
Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure if this will work as separate lines, it says multiple labels should be in a [ ] list....

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I understand the list in add/remove labels in actions but for conditions?
How to write these:

      - "label!=do not merge"
      - "label!=mergify skip"
      - "label=needs: CI"
      - "label!=['do not merge', mergify skip]"
      - "label=needs: CI"

I believe both should have the same result if are loaded from yaml

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This code snippet was taken from "ready for merge" rule, and that one was working (considering labels), so as it is it should work. Pitty, I can't test here but first merge the config and then on another PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ive checked again, also works in case of release label:

-label~=^(release-version)
 -label~=^(Release review required)

So this will work as it is in the PR

@0xc0170
Copy link
Contributor Author

0xc0170 commented Feb 26, 2020

CI started

@0xc0170 0xc0170 merged commit a8fe831 into ARMmbed:master Feb 26, 2020
@0xc0170 0xc0170 deleted the fix_mergify_skip branch February 26, 2020 15:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants