Skip to content

[Merged by Bors] - fix(maintainer_merge_*.yml): don't require \r in maintainer merge comment#14663

Closed
bryangingechen wants to merge 1 commit intomasterfrom
bryangingechen/fix-ghost-maintainer-merge
Closed

[Merged by Bors] - fix(maintainer_merge_*.yml): don't require \r in maintainer merge comment#14663
bryangingechen wants to merge 1 commit intomasterfrom
bryangingechen/fix-ghost-maintainer-merge

Conversation

@bryangingechen
Copy link
Copy Markdown
Contributor

I checked the raw form of some comments and they were missing the \r, so I'm pretty sure this is why some of them get ignored by the bots.


Open in Gitpod

@bryangingechen bryangingechen added easy < 20s of review time. See the lifecycle page for guidelines. CI Modifies the continuous integration setup or other automation labels Jul 11, 2024
@github-actions github-actions bot added the new-contributor This PR was made by a contributor with at most 5 merged PRs. Welcome to the community! label Jul 11, 2024
@github-actions
Copy link
Copy Markdown

PR summary a0f579171c

Import changes for modified files

No significant changes to the import graph

Import changes for all files
Files Import difference

Declarations diff

No declarations were harmed in the making of this PR! 🐙

You can run this locally as follows
## summary with just the declaration names:
./scripts/declarations_diff.sh <optional_commit>

## more verbose report:
./scripts/declarations_diff.sh long <optional_commit>

@grunweg
Copy link
Copy Markdown
Contributor

grunweg commented Jul 11, 2024

Seems like a plausible explanation. Let me
maintainer merge
(oh the irony)

Copy link
Copy Markdown
Contributor

@Ruben-VandeVelde Ruben-VandeVelde left a comment

Choose a reason for hiding this comment

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

Let's try

maintainer merge

@github-actions
Copy link
Copy Markdown

🚀 Pull request has been placed on the maintainer queue by grunweg.

@github-actions github-actions bot added the maintainer-merge A reviewer has approved the changed; awaiting maintainer approval. label Jul 11, 2024
@github-actions
Copy link
Copy Markdown

🚀 Pull request has been placed on the maintainer queue by Ruben-VandeVelde.

@bryangingechen bryangingechen changed the title fix(maintainger_merge_*.yml): don't require \r in maintainer merge comment fix(maintainer_merge_*.yml): don't require \r in maintainer merge comment Jul 11, 2024
@jcommelin
Copy link
Copy Markdown
Member

Thanks 🎉

bors merge

@github-actions github-actions bot added the ready-to-merge This PR has been sent to bors. label Jul 12, 2024
mathlib-bors bot pushed a commit that referenced this pull request Jul 12, 2024
…ment (#14663)

I checked the raw form of some comments and they were missing the `\r`, so I'm pretty sure this is why some of them get ignored by the bots.
@mathlib-bors
Copy link
Copy Markdown
Contributor

mathlib-bors bot commented Jul 12, 2024

Pull request successfully merged into master.

Build succeeded:

@mathlib-bors mathlib-bors bot changed the title fix(maintainer_merge_*.yml): don't require \r in maintainer merge comment [Merged by Bors] - fix(maintainer_merge_*.yml): don't require \r in maintainer merge comment Jul 12, 2024
@mathlib-bors mathlib-bors bot closed this Jul 12, 2024
@mathlib-bors mathlib-bors bot deleted the bryangingechen/fix-ghost-maintainer-merge branch July 12, 2024 05:30
@adomani adomani mentioned this pull request Aug 1, 2024
mathlib-bors bot pushed a commit that referenced this pull request Sep 5, 2024
Currently the bots sometimes end up failing to apply the `ready to merge` label due to this, see e.g. [this comment](#16452 (comment)) and [the corresponding run](https://github.com/leanprover-community/mathlib4/actions/runs/10685754793).

The underlying issue is probably the same as that was causing ghost maintainer merges which was fixed in #14663, so I've applied the same change to the remaining workflow files where this was a potential issue. 

I found one other place in labels_from_comment.yml which was relying on line endings being `\r\n` so I've fixed that by using a regex that allows for both `\r\n` and `\n`.
bjoernkjoshanssen pushed a commit that referenced this pull request Sep 9, 2024
Currently the bots sometimes end up failing to apply the `ready to merge` label due to this, see e.g. [this comment](#16452 (comment)) and [the corresponding run](https://github.com/leanprover-community/mathlib4/actions/runs/10685754793).

The underlying issue is probably the same as that was causing ghost maintainer merges which was fixed in #14663, so I've applied the same change to the remaining workflow files where this was a potential issue. 

I found one other place in labels_from_comment.yml which was relying on line endings being `\r\n` so I've fixed that by using a regex that allows for both `\r\n` and `\n`.
bjoernkjoshanssen pushed a commit that referenced this pull request Sep 9, 2024
Currently the bots sometimes end up failing to apply the `ready to merge` label due to this, see e.g. [this comment](#16452 (comment)) and [the corresponding run](https://github.com/leanprover-community/mathlib4/actions/runs/10685754793).

The underlying issue is probably the same as that was causing ghost maintainer merges which was fixed in #14663, so I've applied the same change to the remaining workflow files where this was a potential issue. 

I found one other place in labels_from_comment.yml which was relying on line endings being `\r\n` so I've fixed that by using a regex that allows for both `\r\n` and `\n`.
bjoernkjoshanssen pushed a commit that referenced this pull request Sep 12, 2024
Currently the bots sometimes end up failing to apply the `ready to merge` label due to this, see e.g. [this comment](#16452 (comment)) and [the corresponding run](https://github.com/leanprover-community/mathlib4/actions/runs/10685754793).

The underlying issue is probably the same as that was causing ghost maintainer merges which was fixed in #14663, so I've applied the same change to the remaining workflow files where this was a potential issue. 

I found one other place in labels_from_comment.yml which was relying on line endings being `\r\n` so I've fixed that by using a regex that allows for both `\r\n` and `\n`.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CI Modifies the continuous integration setup or other automation easy < 20s of review time. See the lifecycle page for guidelines. maintainer-merge A reviewer has approved the changed; awaiting maintainer approval. new-contributor This PR was made by a contributor with at most 5 merged PRs. Welcome to the community! ready-to-merge This PR has been sent to bors.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants