Skip to content

Mergify update #12673

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

Merged
merged 5 commits into from
Mar 23, 2020
Merged

Mergify update #12673

merged 5 commits into from
Mar 23, 2020

Conversation

adbridge
Copy link
Contributor

Summary of changes

A number of Mergify rules were not quite working as expected. This update fixes them and adds a new rule.

1. If a PR is closed but not merged then remove all labels
2. If a release version is added and there are release version missing
   or Release review required, then remove those labels

3. In the check for conflicts rule, add the condition 'open' so
   that it isn't applied to closed or merged PRs

Impact of changes

Mergify rules work correctly

Migration actions required

Documentation

None

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

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

Reviewers


1. If a PR is closed but not merged then remove all labels
2. If a release version is added and there are release version missing
   or Release review required, then remove those labels

3. In the check for conflicts rule, add the condition 'open' so
   that it isn't applied to closed or merged PRs
@adbridge adbridge requested a review from 0xc0170 March 23, 2020 15:48
@ciarmcom ciarmcom requested a review from a team March 23, 2020 16:00
@ciarmcom
Copy link
Member

@adbridge, thank you for your changes.
@ARMmbed/mbed-os-maintainers please review.

.mergify.yml Outdated
- name: release version is a must for merged PRs part 2
conditions:
- merged
- -label=^(release-version)
Copy link
Contributor

Choose a reason for hiding this comment

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

this shouldn't be - label=^(release-version) - otherwise its negative (not release label and merged) ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah yes it should be
Pr is merged and a label beginning with 'release-version' is present. I missed the extra '-'

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should now be fixed

@ciarmcom ciarmcom requested a review from a team March 23, 2020 18:00
@ciarmcom
Copy link
Member

@adbridge, thank you for your changes.
@ARMmbed/mbed-os-maintainers please review.

@0xc0170
Copy link
Contributor

0xc0170 commented Mar 23, 2020

CI started

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.

3 participants